Javi Gallego
|
9c271eee08
|
Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev
Reviewed-on: verdnatura/salix-front#793
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-19 07:10:06 +00:00 |
Pablo Natek
|
6ab31fa2d2
|
Merge branch 'dev' into 8138-add-component-ticketProblems
|
2024-11-19 07:02:32 +00:00 |
Alex Moreno
|
8d997b5a7a
|
build: refs #8144 change package version
|
2024-11-19 07:59:48 +01:00 |
Pablo Natek
|
f999760205
|
fix: refs #8138 sme minor issues
|
2024-11-19 07:59:45 +01:00 |
Pablo Natek
|
e119bf5bfc
|
feat: refs #8138 add component ticket problems
|
2024-11-19 07:59:14 +01:00 |
Alex Moreno
|
afaf2df2ee
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-11-19 07:56:04 +01:00 |
Alex Moreno
|
43f58d3dba
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-11-19 07:48:02 +01:00 |
Javi Gallego
|
7d2f4bcf44
|
Merge branch 'dev' into 7346-manualInvoice
|
2024-11-18 15:46:08 +01:00 |
Alex Moreno
|
c2db7be8cd
|
fix(orderCatalogFilter): fix searchByTag
|
2024-11-18 15:06:09 +01:00 |
William Buezas
|
28bfda869a
|
refactor: refs #8162 remove comment
|
2024-11-18 10:47:57 -03:00 |
Javier Segarra
|
73072794ee
|
test: refs #8162 #8162 fix TicketList spec
|
2024-11-18 14:41:27 +01:00 |
Alex Moreno
|
00fdbfa2e4
|
fix(OrderCatalogFilter): hotFix use search-url="params"
|
2024-11-18 13:41:54 +01:00 |
Alex Moreno
|
8f526798f9
|
Merge pull request 'fix: hotfix OrderTickets' (!960) from hotfix-orderTickets into master
Reviewed-on: verdnatura/salix-front#960
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-18 12:31:06 +00:00 |
Alex Moreno
|
f3ca51aab4
|
Merge branch 'master' into hotfix-orderTickets
|
2024-11-18 12:30:22 +00:00 |
Carlos Satorres
|
d3993442b6
|
fix: hotfix OrderTickets
|
2024-11-18 13:26:27 +01:00 |
Javier Segarra
|
2f06eea8ea
|
Merge branch 'dev' into 8162-E2ETickets
|
2024-11-18 12:03:10 +00:00 |
Jon Elias
|
3c5472ad4a
|
Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev
Reviewed-on: verdnatura/salix-front#959
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-18 11:28:25 +00:00 |
Jon Elias
|
0c0b9ca648
|
fix: changed route.query
|
2024-11-18 12:27:07 +01:00 |
Alex Moreno
|
dd490888cf
|
merge test in dev
|
2024-11-18 11:23:36 +01:00 |
Alex Moreno
|
09be2d4d41
|
Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev
Reviewed-on: verdnatura/salix-front#957
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-18 10:21:50 +00:00 |
Alex Moreno
|
1e7f2b3f4d
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-11-18 11:14:29 +01:00 |
Alex Moreno
|
009a6b09d6
|
Merge pull request 'feat(TicketSummary): add ticketDescritporMenu' (!956) from hotFix_ticketSummary_add_ticketDescriptorMenu into master
Reviewed-on: verdnatura/salix-front#956
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-11-18 10:11:42 +00:00 |
Alex Moreno
|
5b4299114b
|
Merge branch 'master' into hotFix_ticketSummary_add_ticketDescriptorMenu
|
2024-11-18 10:00:54 +00:00 |
Javier Segarra
|
5ab28c13d0
|
Merge pull request 'HOTFIX: CustomerSummary BalanceDue' (!955) from hotFix_customerSumamry_balanceDue into master
Reviewed-on: verdnatura/salix-front#955
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-18 10:00:08 +00:00 |
Javier Segarra
|
f52095a2fc
|
Merge branch 'test' into solveConflicts_test_to_dev
|
2024-11-18 10:57:49 +01:00 |
Alex Moreno
|
383f51c1b2
|
refactor(TicketDescritporMenu): url isEditable
|
2024-11-18 10:57:26 +01:00 |
Javier Segarra
|
0c36d385ec
|
Merge branch 'test' into solveConflicts_test_to_dev
|
2024-11-18 10:50:42 +01:00 |
Alex Moreno
|
09aad5914f
|
feat(TicketSummary): add ticketDescritporMenu
|
2024-11-18 10:49:30 +01:00 |
Javier Segarra
|
9ea9239250
|
fix: customerSummary balanceDue label value
|
2024-11-18 10:41:25 +01:00 |
Alex Moreno
|
29239ef2cd
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-11-18 10:13:27 +01:00 |
Alex Moreno
|
03490b7f3a
|
Merge pull request 'hotFix(TicketBasicData): getShipped, getLanded & bad try catch' (!953) from hotFix_ticketBasicData_getLanded_getShipped into master
Reviewed-on: verdnatura/salix-front#953
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-18 09:13:14 +00:00 |
Alex Moreno
|
b74c1d1823
|
Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped
|
2024-11-18 09:12:28 +00:00 |
Alex Moreno
|
27a1d7460d
|
Merge pull request 'hotFix_arrayData_store_data' (!929) from hotFix_arrayData_store_data into master
Reviewed-on: verdnatura/salix-front#929
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-11-18 09:12:21 +00:00 |
Alex Moreno
|
149f92bc93
|
Merge branch 'master' into hotFix_arrayData_store_data
|
2024-11-18 09:08:37 +00:00 |
Alex Moreno
|
a50b22bb2a
|
Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped
|
2024-11-18 09:08:29 +00:00 |
Javier Segarra
|
ff9d793378
|
Merge pull request 'HOTFIX: #7671 apply sort-by itemFk and name' (!949) from hotfix_itemFixedPrice_sortBy into master
Reviewed-on: verdnatura/salix-front#949
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-18 09:08:05 +00:00 |
Alex Moreno
|
48513868b1
|
Merge branch 'master' into hotFix_arrayData_store_data
|
2024-11-18 09:04:21 +00:00 |
Jon Elias
|
a64575c7cc
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneLocationsTree
|
2024-11-18 09:48:02 +01:00 |
Jon Elias
|
452ba788c9
|
fix: how only the correct path of the search
|
2024-11-18 09:46:34 +01:00 |
Alex Moreno
|
e230cc61a0
|
fix(TicketBasicData): getShipped, getLanded & bad try catch
|
2024-11-18 09:18:06 +01:00 |
Jon Elias
|
80770b1165
|
Merge pull request '#8185 Fix LeftMenu to avoid duplicates' (!952) from 8185-DuplicateLeftMenu into dev
Reviewed-on: verdnatura/salix-front#952
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-18 06:33:54 +00:00 |
Jon Elias
|
3d8aa3cff9
|
Merge branch 'dev' into 8185-DuplicateLeftMenu
|
2024-11-18 06:21:42 +00:00 |
Alex Moreno
|
34ccbccf20
|
Merge pull request 'Down changes from master to test' (!950) from master into test
Reviewed-on: verdnatura/salix-front#950
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-18 06:15:13 +00:00 |
Jon Elias
|
2bc219a09b
|
refactor: refs #8185 modified LeftMenu to avoid duplicates
|
2024-11-18 06:59:09 +01:00 |
William Buezas
|
d8c1bd5b16
|
test: refs #8162 more tests
|
2024-11-17 15:24:46 -03:00 |
Javier Segarra
|
5e5d2f3c42
|
fix: #7671 apply sort-by itemFk and name
|
2024-11-17 13:44:44 +00:00 |
Javier Segarra
|
4116f681b0
|
test: refs #8061 #8061 remove only
|
2024-11-17 14:27:51 +01:00 |
Javier Segarra
|
95758e2564
|
test: refs #8061 #8061 CreateNewPostcodeForm
|
2024-11-17 14:25:23 +01:00 |
Javier Segarra
|
8e37d22164
|
test: refs #8061 #8061 CreateNewPostcodeForm
|
2024-11-17 14:22:42 +01:00 |
Javier Segarra
|
69e6f0f467
|
test: refs #8061 #8061 CreateNewPostcodeForm
|
2024-11-17 12:57:35 +01:00 |