7360 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Carlos Satorres	3f486f6514	Merge pull request 'fix: refs #7310 clean warning' (!840) from 7310-warningTravelTermographs into dev ... Reviewed-on: #840 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-15 11:10:28 +00:00
Jon Elias	89661397fb	Merge branch 'master' into Hotfix-TicketList	2024-11-15 11:09:20 +00:00
Carlos Satorres	95291d4d4e	Merge branch 'dev' into 7310-warningTravelTermographs	2024-11-15 11:06:03 +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
Alex Moreno	e8f0bc9965	Merge pull request 'feat(VnSelect): refs #7136 add scroll' (!890) from 7136-vnSelect_paginate_simplify_2 into dev ... Reviewed-on: #890 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-15 10:24:46 +00:00
Javier Segarra	d52a0fdc7f	fix: customer Risk icon color	2024-11-15 10:23:57 +00:00
Alex Moreno	0e93766670	Merge branch 'dev' into 7136-vnSelect_paginate_simplify_2	2024-11-15 10:23:55 +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
Guillermo Bonet	3c77076718	Merge pull request 'refactor: refs #7950 Created cmr model' (!911) from 7950-cmrModelUnify into dev ... Reviewed-on: #911 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:04:51 +00:00
Guillermo Bonet	c607fc5f61	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:30 +00: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
Jorge Penadés	7626c777ed	Merge pull request 'feat: refs #7874 improve vn-notes ui' (!938) from 7874-improveVnNotesUi into dev ... Reviewed-on: #938 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:21:24 +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	39e8f73d1b	Merge branch 'dev' of https: refs #7136//gitea.verdnatura.es/verdnatura/salix-front into 7136-vnSelect_paginate_simplify_2	2024-11-14 16:05:08 +01:00
Jorge Penadés	8e0b098756	fix: refs #7874 add title	2024-11-14 16:01:09 +01:00
Jorge Penadés	59b40fed45	feat: refs #7874 improve vn-notes ui	2024-11-14 15:57:01 +01:00
Javier Segarra	e6ba0c7c30	Merge branch 'master' into hotfix_termograph_filter	2024-11-14 14:56:30 +00:00
Jorge Penadés	8d070edf8d	Merge pull request 'feat: refs #6839 normalize search' (!936) from 6839-normalizeSearch into dev ... Reviewed-on: #936 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 14:06:03 +00:00
Alex Moreno	045a828bf9	fix(ZoneCard): fix ZoneLocations redirections	2024-11-14 13:59:04 +01:00
Jorge Penadés	7224860c5c	feat: refs #6839 normalize search	2024-11-14 13:51:39 +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
Javier Segarra	68994db6ff	Merge pull request 'Change layout CustomerDescriptor Actions' (!931) from warmFix_customerDescriptorActions into dev ... Reviewed-on: #931 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-14 12:23:33 +00:00
Javier Segarra	61cd8c49c6	Merge branch 'dev' into warmFix_customerDescriptorActions	2024-11-14 12:22:33 +00:00