solveConflicts_test_to_dev #957

Merged

alexm merged 58 commits from solveConflicts_test_to_dev into dev 2024-11-18 10:21:51 +00:00

Conversation 0 Commits 58 Files Changed 35 +207 -187

58 Commits

Author	SHA1	Message	Date
Javier Segarra	f52095a2fc	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:57:49 +01:00
Javier Segarra	0c36d385ec	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:50:42 +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
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
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
Javier Segarra	064dbfc432	fix: #6943 Update AddressObservations	2024-11-15 12:20:50 +00:00
Jon Elias	f03e5dc412	Merge pull request 'Hotfix: fixed state column in TicketList and translation' (!944) from Hotfix-TicketList into master ... Reviewed-on: #944 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 11:11:14 +00:00
Jon Elias	89661397fb	Merge branch 'master' into Hotfix-TicketList	2024-11-15 11:09:20 +00:00
Javier Segarra	d0427c17be	Merge pull request 'HOTFIX: #6943 CustomerDescriptor actions' (!943) from hotfix-customerDescriptor_actions into master ... Reviewed-on: #943 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 11:04:34 +00:00
Jon Elias	1fc2ae0689	Merge branch 'master' into Hotfix-TicketList	2024-11-15 10:53:53 +00:00
Jon Elias	eb287696fa	fix: fixed state column in ticket list	2024-11-15 11:49:46 +01:00
Javier Segarra	e64ea2db19	feat: #6943 CustomerList salesPerson	2024-11-15 11:48:19 +01:00
Javier Segarra	4d8432feb5	revert: #6943 address star feature	2024-11-15 11:46:55 +01:00
Javier Segarra	bdd36f6ba1	Merge branch 'master' into hotfix-customerDescriptor_actions	2024-11-15 11:44:41 +01:00
Javier Segarra	c465c9b2c7	Merge branch 'master' into hotfix-customerDescriptor_actions	2024-11-15 11:41:28 +01:00
Javier Segarra	87ba74bcfc	perf: #6943 Create ticket from client	2024-11-15 11:39:43 +01:00
Javier Segarra	8e52bd0688	perf: #6943 improve OrderList	2024-11-15 11:37:27 +01:00
Javier Segarra	2891e1363a	feat: #6943 CustomerDescriptor actions	2024-11-15 11:36:20 +01:00
Javier Segarra	c57ff7b3c9	Merge pull request 'HOTFIX: Customer Risk color' (!942) from hotFix_customerRisk_icon into master ... Reviewed-on: #942 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 10:32:35 +00:00
Javier Segarra	d3f538e37c	perf: previous commit	2024-11-15 10:27:37 +00:00
Javier Segarra	d52a0fdc7f	fix: customer Risk icon color	2024-11-15 10:23:57 +00:00
Alex Moreno	e19d11baa8	Merge branch 'master' into hotFix_arrayData_store_data	2024-11-15 08:21:27 +00:00
Alex Moreno	f2b132db79	fix(VnPaginate): not start without data	2024-11-15 08:50:10 +01:00
Jon Elias	141cb32cae	Merge branch 'master' into Hotfix-SalesMana	2024-11-15 07:23:59 +00:00
Jon Elias	354f2ce055	fix: deleted duplicate VnUsesMana	2024-11-15 08:21:29 +01:00
Javier Segarra	0a239e8c43	Merge pull request 'HOTFIX: customerFilter sales person input' (!939) from hotfix_customer_salesPerson_Filter into master ... Reviewed-on: #939 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:26:44 +00:00
Javier Segarra	ca0d70933e	Merge branch 'master' into hotfix_customer_salesPerson_Filter	2024-11-14 15:26:00 +00:00
Javier Segarra	64c884693d	Merge pull request 'HOTFIX #8192 Filter termopragh' (!934) from hotfix_termograph_filter into master ... Reviewed-on: #934 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:21:20 +00:00
Javier Segarra	cb1c050343	fix: customerFilter sales person input	2024-11-14 16:18:22 +01:00
Javier Segarra	e6ba0c7c30	Merge branch 'master' into hotfix_termograph_filter	2024-11-14 14:56:30 +00:00
Alex Moreno	045a828bf9	fix(ZoneCard): fix ZoneLocations redirections	2024-11-14 13:59:04 +01:00
Alex Moreno	a929dec2ab	fix(ZoneCard): fix ZoneLocations redirections	2024-11-14 13:42:46 +01:00
Javier Segarra	c4cad9b7bb	Merge branch 'master' into hotfix_termograph_filter	2024-11-14 12:27:57 +00:00
Javier Segarra	84414df487	Merge branch 'hotfix_termograph_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_termograph_filter	2024-11-14 13:27:41 +01:00
Javier Segarra	aa5eb005fd	feat: #8192 remove expr-builder proposal	2024-11-14 13:27:38 +01:00
Alex Moreno	925ff859cc	fix(ZoneCard): fix ZoneLocations redirections	2024-11-14 13:01:56 +01:00
Javier Segarra	259f0e30af	Merge branch 'master' into hotfix_termograph_filter	2024-11-14 11:59:33 +00:00
Javier Segarra	faf307bc16	fix: #8192 find by thermographFk instead id	2024-11-14 12:59:18 +01:00
Alex Moreno	218d041000	fix(ZoneCard): fix ZoneLocations redirections	2024-11-14 12:58:41 +01:00
Alex Moreno	55b4c07e80	fix(ZoneCard): fix ZoneLocations searchbar	2024-11-14 12:33:44 +01:00
Alex Moreno	139861f6cf	test: fix limit	2024-11-14 10:38:02 +01:00
Alex Moreno	94c7ee3ae3	fix: arrayData store shared	2024-11-14 10:36:42 +01:00