7019 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	3d8aa3cff9	Merge branch 'dev' into 8185-DuplicateLeftMenu	2024-11-18 06:21:42 +00:00
Jon Elias	2bc219a09b	refactor: refs #8185 modified LeftMenu to avoid duplicates	2024-11-18 06:59:09 +01: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
Carlos Satorres	95291d4d4e	Merge branch 'dev' into 7310-warningTravelTermographs	2024-11-15 11:06:03 +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
Alex Moreno	0e93766670	Merge branch 'dev' into 7136-vnSelect_paginate_simplify_2	2024-11-15 10:23:55 +00: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
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	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
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
Jorge Penadés	7224860c5c	feat: refs #6839 normalize search	2024-11-14 13:51:39 +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
Javier Segarra	291e97e540	feat: #6943 use openURL quasar	2024-11-14 12:48:33 +01:00
Alex Moreno	73c6dcfdd1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-14 12:20:17 +01:00
Alex Moreno	c65f15d0f0	fix(Zone): if route is null	2024-11-14 12:18:39 +01:00
Carlos Satorres	27accd0e8b	Merge pull request 'fix: refs #7306 clean warning' (!839) from 7306-warningCustomerUnpaid into dev ... Reviewed-on: #839 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 11:09:25 +00:00
Carlos Satorres	857136a866	Merge branch 'dev' into 7306-warningCustomerUnpaid	2024-11-14 11:08:37 +00:00
Javier Segarra	ecf131ba78	feat: move buttons to DescriptorMenu	2024-11-14 12:06:12 +01:00
Jorge Penadés	84802cf267	Merge pull request 'refactor: refs #6818 change channel source' (!932) from 6818-useDefaultChannel into dev ... Reviewed-on: #932 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 10:31:15 +00:00
Jorge Penadés	877497e8ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-useDefaultChannel	2024-11-14 11:29:58 +01:00
Alex Moreno	e0e03526af	Merge pull request 'warmFix: Revert previous commit e57a253c6f649382da187d1129449d265fb26d3b' (!930) from revert_warning_inject into dev ... Reviewed-on: #930 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 10:28:37 +00:00
Jorge Penadés	c4a4f7fcd6	refactor: refs #6818 change channel source	2024-11-14 11:20:16 +01:00
Carlos Satorres	5b444ef0f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7306-warningCustomerUnpaid	2024-11-14 10:54:22 +01:00
Javier Segarra	2bcd7061cb	revert e57a253c6f ... revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev Reviewed-on: #928 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 09:50:00 +00:00
Javier Segarra	e57a253c6f	Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev ... Reviewed-on: #928 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 08:09:09 +00:00
Javier Segarra	b0bb09e9a6	perf: refs #7308 #7308 remove comments	2024-11-14 09:03:18 +01:00
Carlos Satorres	a115caac71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs	2024-11-14 08:34:56 +01:00
Javier Segarra	0fe5f6d54d	Merge branch 'dev' into 7308-warning_inject	2024-11-14 07:20:28 +00:00
Javier Segarra	590d495dbd	test: refs #7308 #7308 axios.spec.js	2024-11-14 08:19:41 +01:00
Javier Segarra	ef415d080a	feat: refs #7308 #7308 remove warnings related to useSession	2024-11-14 08:19:19 +01:00
Jon Elias	483760c8cd	Merge pull request '#7132 fix translations' (!843) from 7132-FixTranslations into dev ... Reviewed-on: #843 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-14 07:10:49 +00:00
Jon Elias	f9ef50db02	Merge branch 'dev' into 7132-FixTranslations	2024-11-14 07:10:02 +00:00
Guillermo Bonet	c2b6b816a4	fix: refs #7283 Account image resolution	2024-11-14 08:04:06 +01:00
Jon Elias	eecf8beb7a	Merge pull request 'Hotfix: allow decimal numbers when creating a purchase request' (!927) from Hotfix-CreateRequest into master ... Reviewed-on: #927 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 13:18:48 +00:00
Jon Elias	bcb777d4bc	Merge branch 'master' into Hotfix-CreateRequest	2024-11-13 13:18:00 +00:00
Jon Elias	540e0348a1	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-11-13 14:10:08 +01:00
Carlos Satorres	9e653b8c2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs	2024-11-13 14:05:57 +01:00
Javier Segarra	9afbcd5cea	Merge pull request 'fix: customer last tickets' (!926) from fixCustomerSumarryLastTickets into master ... Reviewed-on: #926 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-13 12:56:24 +00:00
Pablo Natek	ddfea42c62	fix: add click stop on descriptorProxis	2024-11-13 13:51:37 +01:00
Jon Elias	75c33dabf1	Merge branch 'master' into Hotfix-CreateRequest	2024-11-13 12:41:40 +00:00
Jon Elias	244c23be1d	fix: allow decimal numbers when creating a purchase request	2024-11-13 13:40:19 +01:00
Pablo Natek	1c5a02fe52	fix: customer last tickets	2024-11-13 13:17:15 +01:00
Pablo Natek	8d296daf1e	Merge pull request 'fix: refs #7404 some filter issues' (!921) from 7404-fixFilterIsssues into master ... Reviewed-on: #921 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:25:31 +00:00
Pablo Natek	bccfb161e6	Merge branch 'master' into 7404-fixFilterIsssues	2024-11-13 11:24:25 +00:00
Jorge Penadés	76187f00a1	Merge pull request 'feat: add city name' (!925) from 7354-hotfix-showCity into master ... Reviewed-on: #925 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:23:17 +00:00
Jorge Penadés	b68868e103	feat: add city name	2024-11-13 12:11:15 +01:00