7131 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	5acce4d61d	Merge branch 'dev' into 6999-AddTabToFilter	2024-11-19 09:21:10 +00:00
Alex Moreno	19cb781800	Merge pull request '#8036 - arrayData_exprBuilder_after' (!845) from 8036-arrayData_exprBuilder_after into dev ... Reviewed-on: #845 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-19 09:03:49 +00:00
Alex Moreno	88d2384c35	Merge branch 'dev' of https: refs #8036//gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after	2024-11-19 10:00:20 +01:00
Alex Moreno	a14cc29fc4	build: change package version	2024-11-19 09:12:43 +01:00
Alex Moreno	a43c28cb57	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 09:11:52 +01:00
Alex Moreno	b26028c6a5	Merge pull request '8144-devToTest_2448' (!963) from 8144-devToTest_2448 into test ... Reviewed-on: #963 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-19 07:54:41 +00:00
Javi Gallego	9c271eee08	Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev ... Reviewed-on: #793 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 07:10:06 +00:00
Alex Moreno	8d997b5a7a	build: refs #8144 change package version	2024-11-19 07:59:48 +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	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: #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
Jon Elias	3c5472ad4a	Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev ... Reviewed-on: #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: #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: #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: #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: #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: #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: #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
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: #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: #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
Javier Segarra	5e5d2f3c42	fix: #7671 apply sort-by itemFk and name	2024-11-17 13:44:44 +00:00
Jon Elias	6de5864dd6	Merge pull request 'Hotix: deleted duplicate VnUsesMana' (!940) from Hotfix-SalesMana into master ... Reviewed-on: #940 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 13:32:42 +00:00
Jon Elias	1dc2f54f61	Merge branch 'master' into Hotfix-SalesMana	2024-11-15 13:31:53 +00:00
Javier Segarra	b8293d91e8	Merge pull request 'HOTFIX: #6943 hotFix_AddressObservation_crud' (!945) from hotFix_AddressObservation_crud into master ... Reviewed-on: #945 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 13:14:26 +00:00
Javier Segarra	2e2a118627	Merge branch 'master' into hotFix_AddressObservation_crud	2024-11-15 12:55:08 +00:00
Javier Segarra	94873f7771	Merge pull request 'fix: Redirect to catalog when create new order' (!947) from hotfix_OrderNew_redirectTo into master ... Reviewed-on: #947 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-11-15 12:52:17 +00:00
Javier Segarra	5916923521	fix: Redirect to catalog when create new order	2024-11-15 12:51:25 +00:00
Javier Segarra	acaf7f2930	Merge pull request 'fix: Redirect to catalog when create new order' (!946) from hotfix_OrderNew_redirectTo_catalog into master ... Reviewed-on: #946 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 12:38:39 +00:00
Javier Segarra	54a34e8034	fix: Redirect to catalog when create new order	2024-11-15 12:33:56 +00:00