7128 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javier Segarra	5af494e13c	perf: refs #7346 #7346 use v-show instead v-if	2024-11-14 11:54:04 +01:00
Javier Segarra	aa05b4b0cb	perf: refs #7346 #7346 Imrpove interface dialog	2024-11-14 11:51:06 +01:00
Javier Segarra	d284cec31a	Merge branch '7346-manualInvoice' of https: refs #7346//gitea.verdnatura.es/verdnatura/salix-front into 7346-manualInvoice	2024-11-14 11:50:09 +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
Javi Gallego	c0ddc2c5b4	fix: refs #7346 traslations	2024-11-14 10:47:14 +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
Javi Gallego	79ce2ad79e	Merge branch 'dev' into 7346-manualInvoice	2024-11-14 09:22:18 +01: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
Jorge Penadés	7dba1a1846	Merge pull request 'feat: refs #6818 add icon' (!924) from 6818-addIcon into dev ... Reviewed-on: #924 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:01:40 +00:00
Jorge Penadés	9291c4dd6a	feat: refs #6818 add icon	2024-11-13 11:50:08 +01:00
Pablo Natek	f93532d5b7	Merge pull request 'hotfixZoneFilter' (!922) from hotfixZoneFilter into master ... Reviewed-on: #922 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 09:22:15 +00:00
Pablo Natek	178753ddcc	fix: add scope fields on filter	2024-11-13 10:11:14 +01:00
Pablo Natek	8eb76cd0fc	fix: url name	2024-11-13 10:00:04 +01:00
Pablo Natek	81927c5af5	fix: zoneFilter	2024-11-13 09:58:41 +01:00
Jorge Penadés	d474fb924f	Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev ... Reviewed-on: #904 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 08:25:27 +00:00
Jorge Penadés	96e9de519f	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:44 +00:00
Pablo Natek	5c59ae8217	fix: refs #7404 some filter issues	2024-11-13 09:12:51 +01:00
Alex Moreno	1f8ead608c	Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev ... Reviewed-on: #918 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-13 06:48:55 +00:00