8231_testToMaster_2448 #997

Merged

alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00

Conversation 2 Commits 400 Files Changed 268 +4077 -3887

400 Commits

Author	SHA1	Message	Date
Javier Segarra	7e924bc791	Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448	2024-11-25 14:59:29 +01:00
Javier Segarra	2ead484026	test: refs #8231 fix VnLocation	2024-11-25 14:59:26 +01:00
Alex Moreno	594fc60eec	chore: refs #8231 add changelog	2024-11-25 14:49:10 +01:00
Alex Moreno	fbd57dc96b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-25 13:02:58 +01:00
Alex Moreno	01ffb663f1	fix(ClaimList): stateCode orderBy priority	2024-11-22 15:14:03 +01:00
Alex Moreno	14d2ddfa83	fix: merge errors	2024-11-22 12:40:07 +01:00
Alex Moreno	4913cf2c29	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 12:10:04 +01:00
Alex Moreno	142302193e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 11:21:33 +01:00
Alex Moreno	367f660508	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 10:52:30 +01:00
Carlos Andrés	e04d77f55e	Merge pull request 'feat: refs#8087 Redadas en travel' (!984) from travelisRaidTest into test ... Reviewed-on: #984 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-21 14:56:09 +00:00
Carlos Andrés	5268140d8b	feat: refs#8087 Redadas en travel	2024-11-21 15:51:27 +01:00
Alex Moreno	bf0bda0e27	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-21 10:26:29 +01:00
Javier Segarra	f36363dbd2	Merge pull request 'warmfix: ItemLastEntries to date' (!981) from warmfix_itemLastEntriesFilter into test ... Reviewed-on: #981 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-21 09:09:50 +00:00
Javier Segarra	e5434e7436	warmfix: ItemLastEntries to date	2024-11-21 09:08:52 +00:00
Javier Segarra	6f324b44b8	Merge pull request 'WARMFIX: e2e jsegarra' (!973) from fix_js_e2e into test ... Reviewed-on: #973 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 08:20:21 +00:00
Javier Segarra	5a90434425	Merge branch 'test' into fix_js_e2e	2024-11-21 08:19:21 +00:00
Alex Moreno	6b8470d6e1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-21 07:59:42 +01:00
Alex Moreno	c1e06325d3	Merge pull request '#7874 show name' (!978) from 7874-warmfix-useName into test ... Reviewed-on: #978 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-21 06:04:47 +00:00
Jorge Penadés	7039b68bba	fix: refs #7874 show name	2024-11-20 17:23:40 +01:00
Javier Segarra	d6aedad38e	perf: use const in VnLocation	2024-11-20 10:07:03 +01:00
Javier Segarra	deb6467af8	feat: remove comments	2024-11-20 10:05:10 +01:00
Javier Segarra	9da0488184	feat: remove comments	2024-11-20 10:03:23 +01:00
Javier Segarra	226f604f9d	test: #8162 fix vnLocation spec	2024-11-20 09:37:47 +01:00
Javier Segarra	e10ee5e6c7	test: #8162 fix vnLocation spec	2024-11-20 09:26:40 +01:00
Javier Segarra	1fb927488a	test: #8162 fix clientList spec	2024-11-20 09:26:33 +01:00
Javier Segarra	68c9baa7f6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_js_e2e	2024-11-20 08:12:51 +01:00
Alex Moreno	98ac560b16	Merge pull request 'warmFix_vnSearchBar.spec' (!975) from warmFix_vnSearchBar.spec into test ... Reviewed-on: #975 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-20 07:03:53 +00:00
Alex Moreno	c1d9650c60	Merge branch 'test' into warmFix_vnSearchBar.spec	2024-11-20 07:02:22 +00:00
Alex Moreno	e33bb9f8b5	Merge pull request 'fix: logout spec' (!974) from warmFix_logout.spec into test ... Reviewed-on: #974 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-20 07:02:17 +00:00
Alex Moreno	3ba8402dfd	fix: vnSearchbar spec	2024-11-20 08:01:50 +01:00
Alex Moreno	67a5800a66	fix: logout spec	2024-11-20 07:57:45 +01:00
Alex Moreno	44134a8fec	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-20 07:42:25 +01:00
Javier Segarra	b4ee19bcde	test: #8162 fix clientList spec	2024-11-19 15:56:27 +01:00
Javier Segarra	e6f8b87890	Merge branch 'test' into fix_test_jsegarra	2024-11-19 15:05:39 +01:00
Alex Moreno	fdafeee39d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-19 14:49:22 +01:00
Javier Segarra	8fb843a180	Merge pull request 'feat: add /reports in gitignore' (!970) from warmFix_reports_in_gitignore into test ... Reviewed-on: #970 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-19 13:42:47 +00:00
Alex Moreno	5f7fd91272	feat: add /reports in gitignore	2024-11-19 14:41:07 +01:00
Alex Moreno	38c2f89fba	Merge pull request 'fix(VnSelect): setOptions when applyFilter' (!969) from warmFix_vnSelect into test ... Reviewed-on: #969 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-19 13:40:21 +00:00
Alex Moreno	14e6b870ac	Merge branch 'test' into warmFix_vnSelect	2024-11-19 13:29:15 +00:00
Alex Moreno	8714980595	fix(VnSelect): setOptions when applyFilter	2024-11-19 14:28:43 +01:00
Jon Elias	bdae26ba08	Merge pull request 'Warmfix: worker test e2e' (!968) from Fix-WorkerCreateE2E into test ... Reviewed-on: #968 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 13:19:20 +00:00
Jon Elias	1b68d3c5ea	Merge branch 'test' into Fix-WorkerCreateE2E	2024-11-19 13:16:41 +00:00
Jon Elias	f43e974bbc	fix: worker test e2e	2024-11-19 14:14:50 +01:00
Javier Segarra	65100fcf25	test: fix e2e	2024-11-19 13:45:44 +01:00
Jorge Penadés	794036b880	Merge pull request '#7323 warmfix-addRemainingFields' (!965) from 7323-warfix-addRemainingFields into test ... Reviewed-on: #965 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-19 12:37:28 +00:00
Javier Segarra	5515f55bf6	test: fix e2e	2024-11-19 12:51:05 +01:00
Jorge Penadés	1faab668b1	fix: refs #7323 show advanced fields	2024-11-19 11:53:33 +01:00
Jorge Penadés	38ccf464b7	fix: refs #7323 locale #7396	2024-11-19 11:52:00 +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
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
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
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
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
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
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	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
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
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
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
Alex Moreno	2ae9d68fec	Merge branch 'dev' into warmFix_order_equalSalix	2024-11-13 06:21:59 +00:00
Alex Moreno	8269037faa	chore: perf	2024-11-13 07:21:42 +01:00
Guillermo Bonet	8db3ab4d47	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-13 06:13:23 +00:00
Jorge Penadés	83be57a0c4	chore: refs #6818 drop useless code & comment	2024-11-12 15:01:17 +01:00
Jorge Penadés	e29cd38ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration	2024-11-12 15:00:18 +01:00
Alex Moreno	fc28639556	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-12 14:40:42 +01:00
Alex Moreno	3f15c3cce0	feat(VnSelect): order data equal salix	2024-11-12 14:35:55 +01:00
Jorge Penadés	86b8f9bf54	Merge pull request 'feat: refs #6919 sync entry data' (!913) from 6919-reactiveDescriptor into dev ... Reviewed-on: #913 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 12:37:39 +00:00
Jorge Penadés	90f04cc010	Merge branch 'dev' into 6919-reactiveDescriptor	2024-11-12 12:36:48 +00:00
Javier Segarra	830c3658d4	Merge pull request 'fix/OrderCatalog' (!893) from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev ... Reviewed-on: #893 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-12 12:01:43 +00:00
Javier Segarra	a7d53fcbe6	Merge branch 'dev' into fix/OrderCatalog	2024-11-12 11:30:36 +00:00
Jorge Penadés	b4d7653661	refactor: refs #6919 export filter	2024-11-12 11:15:34 +01:00
Jorge Penadés	efd66ea02a	feat: refs #6919 sync entry data	2024-11-12 11:08:45 +01:00
Jorge Penadés	81b35aa75b	chore: refs #6818 add spaces	2024-11-12 10:11:26 +01:00
Jorge Penadés	700701f055	refactor: refs #6818 channel logic	2024-11-12 10:10:26 +01:00
Jorge Penadés	c775ba8592	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration	2024-11-12 09:45:05 +01:00
Jorge Penadés	cc12250109	Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev ... Reviewed-on: #910 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-12 08:35:42 +00:00
Guillermo Bonet	40ecd6e358	refactor: refs #7950 Created cmr model	2024-11-12 08:28:02 +01:00
Jorge Penadés	7f1a4d6cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration	2024-11-11 16:42:20 +01:00
Jorge Penadés	07e7cbc355	feat: refs #6839 module searching	2024-11-11 16:36:18 +01:00
Alex Moreno	e21087e645	Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev ... Reviewed-on: #906 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-11 12:48:16 +00:00
Alex Moreno	777ac58f04	feat(Supplier): add companySize	2024-11-11 10:31:41 +01:00
Jorge Penadés	462382ecb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration	2024-11-08 17:49:35 +01:00
Jorge Penadés	7fb3e71688	feat: refs #6818 fetch url & default channel	2024-11-08 17:41:27 +01:00
William Buezas	ade90afd03	refactor: change keyup.enter for update:model-value	2024-11-08 10:13:35 -03:00
William Buezas	c1d623622d	refactor: remove unused variable	2024-11-08 10:11:15 -03:00
Jorge Penadés	3bae121ed7	fix: refs #6818 use right icon	2024-11-08 13:04:40 +01:00
Javier Segarra	3825dc3851	feat: disabled buttons	2024-11-08 11:54:04 +01:00
Jorge Penadés	a467c44b91	feat: refs #6818 saysimple integration	2024-11-08 11:51:13 +01:00
Javier Segarra	c22c8d9f11	Merge pull request 'Improve required attrs for VnInput*' (!886) from improve_isRequired_input into dev ... Reviewed-on: #886 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-08 10:47:56 +00:00
Javier Segarra	ead326c66b	Merge branch 'improve_isRequired_input' of https://gitea.verdnatura.es/verdnatura/salix-front into improve_isRequired_input	2024-11-08 08:39:29 +01:00
Alex Moreno	dce57f4638	Merge branch 'dev' into improve_isRequired_input	2024-11-08 07:32:07 +00:00
Alex Moreno	0c6d6d6925	Merge pull request 'refs: #7782 Cypress features' (!891) from cypress_features into dev ... Reviewed-on: #891 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-08 07:31:46 +00:00
Javier Segarra	0a5c3bfe5b	Merge branch 'dev' into improve_isRequired_input	2024-11-08 07:29:54 +00:00
Javier Segarra	570c09bab5	Merge branch 'dev' into cypress_features	2024-11-08 07:27:26 +00:00
Javier Segarra	96d68ed106	Merge branch 'dev' into fix/OrderCatalog	2024-11-08 06:59:26 +00:00
William Buezas	8bff7fc1d6	fix: reset category	2024-11-07 21:09:39 -03:00
William Buezas	52a2250acc	refactor: apply QPopupProxy	2024-11-07 19:16:06 -03:00
William Buezas	498a52a3e5	refactor: small change	2024-11-07 19:07:03 -03:00
Alex Moreno	624ba2c13d	Merge pull request 'FIX: #6943 Customer issues' (!885) from fix_customer_issues into dev ... Reviewed-on: #885 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-07 16:20:22 +00:00
Alex Moreno	0b5be9e67f	chore: correct checkNotification	2024-11-07 17:19:35 +01:00
Javier Segarra	e210ad7de4	Merge branch 'dev' into fix_customer_issues	2024-11-07 13:06:33 +01:00
Javier Segarra	489df51d64	Merge branch 'dev' into fix_customer_issues	2024-11-07 12:54:19 +01:00
Javier Segarra	2bf7fa46ca	perf: remove appendParams	2024-11-07 12:53:17 +01:00
Alex Moreno	5d0c91187e	Merge pull request 'fix(InvoiceOutGlobal): parallelism' (!900) from warmFix_invoiceOut_Global into dev ... Reviewed-on: #900 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-07 09:43:18 +00:00
Alex Moreno	18cc3888e5	Merge branch 'dev' into warmFix_invoiceOut_Global	2024-11-07 09:42:09 +00:00
Alex Moreno	cc236cac03	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-07 10:19:02 +01:00
Alex Moreno	2b02c9fbd3	Merge branch 'dev' into warmFix_invoiceOut_Global	2024-11-06 12:54:18 +00:00
Alex Moreno	ead241e7da	chore: remove console.log	2024-11-06 13:53:58 +01:00
Alex Moreno	a2bbf4474d	fix(InvoiceOutGlobal): parallelism	2024-11-06 13:52:59 +01:00
Alex Moreno	473b0808e8	Merge pull request 'feat(VnInput): empty to null' (!898) from 6766-vnInput_emptyToNull into dev ... Reviewed-on: #898 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-05 14:05:01 +00:00
Alex Moreno	abd7b76636	feat(VnInput): empty to null	2024-11-05 13:50:25 +01:00
Jorge Penadés	ec88bcbc44	Merge pull request '#7273 fixItemTags' (!895) from 7273-fixItemTags into dev ... Reviewed-on: #895 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-05 11:56:14 +00:00
Jorge Penadés	9959fbf005	fix: refs #7273 use same filter	2024-11-05 12:23:11 +01:00
Jorge Penadés	4a95a0e39a	chore: refs #7273 sticky add btn & refactor	2024-11-05 11:59:38 +01:00
Jorge Penadés	9ee05721a4	Merge pull request '#8078 enable multi choice' (!848) from 8078-enableMultiSelection into dev ... Reviewed-on: #848 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-05 10:20:04 +00:00
Jorge Penadés	ca9a7f2932	Merge branch 'dev' into 8078-enableMultiSelection	2024-11-05 10:18:46 +00:00
Alex Moreno	14498a78b2	Merge pull request '6920-invoiceInBasicData_useVnDms' (!892) from 6920-invoiceInBasicData_useVnDms into dev ... Reviewed-on: #892 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-05 09:57:31 +00:00
Jorge Penadés	86e6bef90f	chore: refs #8078 fiz tests	2024-11-05 10:37:35 +01:00
Jorge Penadés	a4a4190e4e	Merge branch '8078-enableMultiSelection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-11-05 10:02:33 +01:00
Jorge Penadés	1f9d850fbe	chore: refs #8078 rollback ref	2024-11-05 10:02:29 +01:00
Jorge Penadés	a542f69b0f	Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-11-05 10:02:09 +01:00
Alex Moreno	e050a077d4	test: refactor e2e	2024-11-04 13:41:37 +01:00
Alex Moreno	08204aa5f0	refactor(InvoiceInBasicData): use VnDms	2024-11-04 13:02:39 +01:00
William Buezas	d627c1f698	fix: order catalog	2024-11-03 10:29:03 -03:00
Javier Segarra	1761cc23e0	feat: use composable to unify logic	2024-10-30 08:29:04 +01:00
Javier Segarra	4de23c31b3	feat: use composable to unify logic	2024-10-29 15:01:49 +01:00
Javier Segarra	fbbbc331a9	feat: #7782 add cypress report	2024-10-29 14:27:24 +01:00
Javier Segarra	2090b78ce6	feat: #7782 cypress.config watchForFileChanges	2024-10-29 14:25:34 +01:00
Javier Segarra	b817aa92c2	feat: #7782 npm run resetDatabase	2024-10-29 14:23:22 +01:00
Javier Segarra	ed8225bf6c	feat: #7782 waitUntil domContentLoad	2024-10-29 14:23:06 +01:00
Alex Moreno	f4bdefd4e7	Merge branch 'dev' into improve_isRequired_input	2024-10-29 13:13:59 +00:00
Alex Moreno	bf4bee0f95	feat(VnSelect): refs #7136 add scroll	2024-10-29 14:07:34 +01:00
Jon Elias	e26fdfe4a3	Merge pull request '#7206 added inactive label and corrected minor errors' (!889) from 7206-ModifySelectAddress into dev ... Reviewed-on: #889 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-29 13:05:38 +00:00
Jon Elias	282999c49e	fix: refs #7206 deleted duplicate code	2024-10-29 13:23:15 +01:00
Jon Elias	bf480c20f8	Merge branch '7206-ModifySelectAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress	2024-10-29 13:22:01 +01:00
Jon Elias	8be4210138	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress	2024-10-29 13:21:56 +01:00
Jon Elias	00b4e885c1	Merge branch 'dev' into 7206-ModifySelectAddress	2024-10-29 12:19:19 +00:00
Jon Elias	476ef1dedd	feat: refs #7206 added inactive label and corrected minor errors	2024-10-29 13:14:42 +01:00
Alex Moreno	fa5750bce4	Merge branch 'dev' into 8078-enableMultiSelection	2024-10-29 11:44:04 +00:00
Jon Elias	89dfc0aff5	Merge pull request '#6896 fix Order module problems' (!817) from Fix_OrderModuleProblems into dev ... Reviewed-on: #817 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-29 11:20:13 +00:00
Jon Elias	9104e13a6d	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-29 11:19:21 +00:00
Alex Moreno	53887277ca	Merge pull request 'fix: refs #7283 filter' (!887) from 7283-itemFilterWorkerBuyer into dev ... Reviewed-on: #887 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-29 10:43:32 +00:00
Alex Moreno	c7c1343c06	Merge branch 'dev' into 7283-itemFilterWorkerBuyer	2024-10-29 10:42:39 +00:00
Jorge Penadés	e39f85ff4b	fix: refs #8078 improve handleSelection	2024-10-29 09:56:06 +01:00
Jorge Penadés	19a7e52605	fix: refs #8078 handleSelection	2024-10-29 09:39:56 +01:00
Jorge Penadés	77cb2d84be	fix: refs #8078 handleSelection	2024-10-29 09:38:40 +01:00
Jorge Penadés	71420da586	Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-10-29 09:27:30 +01:00
Jon Elias	1ff77abaf5	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-29 08:26:16 +00:00
Jon Elias	5663064dd8	refactor: modified composable	2024-10-29 09:23:49 +01:00
Alex Moreno	42fbdff5bd	test: fix e2e	2024-10-29 08:48:06 +01:00
Carlos Satorres	96f894cc6c	fix: refs #7283 filter	2024-10-29 08:17:18 +01:00
Guillermo Bonet	df7f9b47d3	Merge pull request 'refactor: refs #7266 Changed method name' (!884) from 7266-buyLabelSupplier into dev ... Reviewed-on: #884 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-29 06:04:21 +00:00
Guillermo Bonet	b8ecf40777	Merge branch 'dev' into 7266-buyLabelSupplier	2024-10-29 06:03:07 +00:00
Javier Segarra	d2680b0a1f	test: fix arrayData	2024-10-29 02:40:47 +01:00
Javier Segarra	4b00ab877c	perf: use required instead :required="true"	2024-10-29 02:26:35 +01:00
Javier Segarra	0b2c404ab3	perf: minor bugs detected	2024-10-29 02:15:21 +01:00
Javier Segarra	0de4dfd4f8	feat: apply changes for customerModule	2024-10-29 02:15:02 +01:00
Jorge Penadés	1e16e3312e	fix: refs #8078 improve cy command	2024-10-28 16:21:00 +01:00
Jorge Penadés	57488503aa	fix: refs #8078 e2e #7970	2024-10-28 16:19:24 +01:00
Jorge Penadés	7e3e194b46	fix: refs #8078 e2e #7970	2024-10-28 16:19:13 +01:00
Jorge Penadés	d5639471cf	feat: refs #8078 add tests	2024-10-28 15:40:36 +01:00
Jorge Penadés	5ef5285abc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-10-28 14:45:40 +01:00
Jorge Penadés	458c6b0f42	Merge pull request 'feat: refs #7524 add front test' (!881) from 7524-addTests into dev ... Reviewed-on: #881 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 13:43:04 +00:00
Jorge Penadés	fecf9fddff	Merge branch 'dev' into 7524-addTests	2024-10-28 13:41:41 +00:00
Carlos Andrés	b8ba313132	Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev ... Reviewed-on: #864 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 13:29:05 +00:00
Jorge Penadés	934b32092b	chore: refs #7524 fix test	2024-10-28 14:21:03 +01:00
Jorge Penadés	a73a451cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-addTests	2024-10-28 14:19:36 +01:00
Guillermo Bonet	15977357d9	refactor: refs #7266 Changed method name	2024-10-28 14:11:34 +01:00
Jon Elias	d4f92812cf	Merge pull request '#7970 notify changes in lines' (!877) from 7970-NotifySaleChanges into dev ... Reviewed-on: #877 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 12:41:47 +00:00
Jon Elias	76dd27638a	Merge branch 'dev' into 7970-NotifySaleChanges	2024-10-28 12:40:47 +00:00
Carlos Satorres	a9092251a8	Merge pull request 'fix: refs #7283 item filters' (!880) from 7283-fixItemFilters into dev ... Reviewed-on: #880 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 12:28:04 +00:00
Jorge Penadés	526b7d91de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection	2024-10-28 13:26:27 +01:00
Jorge Penadés	a1105f2ef1	feat: refs #7524 add front test	2024-10-28 13:24:46 +01:00
Carlos Satorres	d252f6d2a3	fix: refs #7283 fix preview	2024-10-28 13:22:33 +01:00
Carlos Satorres	965c2f7b20	fix: refs #7283 preview	2024-10-28 13:16:51 +01:00
Carlos Satorres	f2803a6313	fix: refs #7283 item filters	2024-10-28 13:08:19 +01:00
Jon Elias	c997081303	Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-28 12:59:26 +01:00
Jon Elias	cab5a165d2	refactor: changed confirmOrder directory	2024-10-28 12:59:25 +01:00
Jon Elias	ac3013205e	Merge branch 'dev' into 7970-NotifySaleChanges	2024-10-28 11:46:02 +00:00
Jon Elias	3d4ca2bc67	refactor: refs #7970 added emit	2024-10-28 12:45:13 +01:00
Jon Elias	639e08406e	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-28 11:22:23 +00:00
Jon Elias	ea05637bf2	Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-28 12:21:28 +01:00
Jon Elias	17b1921af6	feat: added composable to confirm orders	2024-10-28 12:21:26 +01:00
Jon Elias	30f88070ff	Merge pull request '#7193 modified parking to use the scope' (!879) from 7193-ParkingCreateScope into dev ... Reviewed-on: #879 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 10:48:03 +00:00
Jon Elias	e5a221d073	Merge branch '7970-NotifySaleChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 7970-NotifySaleChanges	2024-10-28 11:44:50 +01:00
Jon Elias	9347bb1ef5	refactor: refs #7970 refactored VnConfirm to emit events	2024-10-28 11:44:49 +01:00
Jon Elias	68478c4d13	Merge branch '7193-ParkingCreateScope' of https://gitea.verdnatura.es/verdnatura/salix-front into 7193-ParkingCreateScope	2024-10-28 11:37:33 +01:00
Jon Elias	2cde850132	fix: refs #7193 fixed e2e test	2024-10-28 11:37:32 +01:00
Jon Elias	18a71e63e1	Merge branch 'dev' into 7193-ParkingCreateScope	2024-10-28 09:41:08 +00:00
Jon Elias	df1c123444	feat: refs #7193 modified parking to use the scope and corrected small errors	2024-10-28 10:39:45 +01:00
Carlos Satorres	9d37d78e8b	Merge pull request 'fix: itemType redirection and fix filters' (!878) from fix_itemType-redirection into dev ... Reviewed-on: #878 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-28 09:22:33 +00:00
Alex Moreno	ffee9fb27c	Merge branch 'dev' into fix_itemType-redirection	2024-10-28 09:14:21 +00:00
Alex Moreno	bc8a87b267	chore: typo	2024-10-28 09:58:07 +01:00
Alex Moreno	cca255507a	fix: itemType redirection and fix filters	2024-10-28 09:57:25 +01:00
Jorge Penadés	bb106e25a0	Merge pull request 'fix: refs #7524 e2e & worker module' (!876) from 7524-fixE2e into dev ... Reviewed-on: #876 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-28 08:51:17 +00:00
Jon Elias	454be43884	Merge branch 'dev' into 7970-NotifySaleChanges	2024-10-28 07:17:06 +00:00
Jon Elias	ca6547e174	feat: refs #7970 notify changes	2024-10-28 07:48:11 +01:00
William Buezas	c93f152060	fix: order catalog fixes	2024-10-27 15:27:53 -03:00
Jorge Penadés	0cc0e82aaa	feat: refs #8078 add shortcut multi selection	2024-10-27 14:48:44 +01:00
Jorge Penadés	1da86900e6	fix: refs #7524 e2e & worker module	2024-10-27 13:43:38 +01:00
Guillermo Bonet	0537213a58	Merge pull request 'feat: refs #7006 itemTypeLog added' (!825) from 7006-itemTypeLog into dev ... Reviewed-on: #825 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 12:32:37 +00:00
Alex Moreno	d14f2bd638	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 12:30:07 +00:00
Guillermo Bonet	494fc66c06	feat: refs #7006 itemType basic data new inputs	2024-10-25 14:14:51 +02:00
William Buezas	211da859bd	fix: catalog view category and type filter	2024-10-25 08:57:16 -03:00
Guillermo Bonet	8edba36a74	feat: refs #7006 itemType basic data new inputs	2024-10-25 13:46:36 +02:00
Alex Moreno	c127fee467	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-25 13:08:37 +02:00
Guillermo Bonet	57a3504a7f	Merge branch 'dev' into 7006-itemTypeLog	2024-10-25 11:06:49 +00:00
Jorge Penadés	1b05a5173d	Merge pull request 'fix: refs #7943 use summary' (!873) from 7943-fixWorker into dev ... Reviewed-on: #873 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 09:54:14 +00:00
Jorge Penadés	cdb73f7a17	fix: refs #7943 use correct data-key	2024-10-25 11:50:20 +02:00
Jorge Penadés	bb51a9e687	fix: refs #7943 use summary	2024-10-25 11:38:00 +02:00
Alex Moreno	fc175666b1	Merge pull request '#6943 add comands to solve tests' (!851) from 6943_customer_spec into dev ... Reviewed-on: #851 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 09:08:09 +00:00
Javier Segarra	6bb6cd8d93	Merge branch 'dev' into 6943_customer_spec	2024-10-25 08:55:04 +00:00
Javier Segarra	02f682ac0b	perf: refs #6943 #6943 merge command	2024-10-25 10:53:19 +02:00
Alex Moreno	e7d0ecf6bb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-25 10:40:57 +02:00
Javier Segarra	ff559384aa	perf: refs #6943 #6943 merge command	2024-10-25 10:33:59 +02:00
Javier Segarra	21c4468fce	Merge branch 'dev' into 6943_customer_spec	2024-10-25 10:33:34 +02:00
Alex Moreno	100dfbec3e	Merge branch 'dev' into 8087-nuevoCampoTravel	2024-10-25 08:14:09 +00:00
Carlos Andrés	9e57c5e452	feat: refs #8087 Traspasar redadas a travels	2024-10-25 10:13:09 +02:00
Carlos Andrés	4c1e4aedd2	feat: refs #8087 Traspasar redadas a travels	2024-10-25 10:03:09 +02:00
Carlos Satorres	a01e685d5d	Merge pull request '#7283 #7831 itemMigration' (!553) from 7283-itemMigration into dev ... Reviewed-on: #553 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-25 07:09:13 +00:00
Carlos Satorres	0cb5f34b15	Merge branch 'dev' into 7283-itemMigration	2024-10-25 07:08:16 +00:00
Alex Moreno	c274641334	Merge pull request 'fix: better performance' (!869) from warmFix_accountAcls into dev ... Reviewed-on: #869 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-25 06:52:31 +00:00
Carlos Satorres	69aec0cd83	Merge branch 'dev' into warmFix_accountAcls	2024-10-25 06:18:47 +00:00
Carlos Satorres	0aec073cf1	Merge pull request 'fix: entryFilters' (!872) from fix-entryFilters into dev ... Reviewed-on: #872 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-25 06:18:07 +00:00
Carlos Satorres	e8d2a40daf	fix: entryFilters	2024-10-25 08:11:31 +02:00
Carlos Andrés	12c236276d	feat: refs #8087 Traspasar redadas a travels	2024-10-24 19:32:20 +02:00
Alex Moreno	92e147355f	fix: better performance	2024-10-24 15:13:05 +02:00
Carlos Satorres	67a5d10a5e	Merge branch 'dev' into 7283-itemMigration	2024-10-24 13:10:23 +00:00
Javier Segarra	855979d22d	perf: refs #7283 #7283 i18n params	2024-10-24 14:59:14 +02:00
Alex Moreno	fd72f4dd45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-24 14:45:34 +02:00
Alex Moreno	e86afd57a0	Merge pull request 'feat: refs #8039 canceledError not notify' (!850) from 8039-canceledError_not_notify into dev ... Reviewed-on: #850 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-10-24 12:44:19 +00:00
Carlos Satorres	8cee3ac713	Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-24 14:08:14 +02:00
Carlos Satorres	c2043902f8	fix: refs #7283 fix required	2024-10-24 14:08:11 +02:00
Carlos Satorres	92ff8c188e	Merge branch 'dev' into 7283-itemMigration	2024-10-24 11:39:33 +00:00
Carlos Satorres	551b81e421	Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-24 13:38:16 +02:00
Carlos Satorres	671d9fd6fb	fix: refs #7283 itemtype fix	2024-10-24 13:38:13 +02:00
Carlos Andrés	64f36c7d4b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:35:11 +02:00
Javier Segarra	3f640c650b	perf: refs #7283 #7283 handle i18n	2024-10-24 12:32:15 +02:00
Javier Segarra	2d8789312b	test: refs #6943 #6943 remove skip tests	2024-10-24 11:34:55 +02:00
Javier Segarra	87d2e0a39b	perf: refs #7283 #7283 handle composable i18n	2024-10-24 10:36:48 +02:00
Javier Segarra	45e6d2011f	Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-24 10:35:24 +02:00
Alex Moreno	de7f55c589	Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-24 07:56:00 +02:00
Alex Moreno	32b4636706	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-24 07:49:10 +02:00
Carlos Satorres	56ef811584	fix: refs #7283 order translation	2024-10-24 07:47:26 +02:00
Javier Segarra	1c8eabe293	perf: refs #7283 #7283 declare composable inst4ead code duplicated	2024-10-24 00:39:35 +02:00
Alex Moreno	d1e4017869	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-23 13:59:11 +02:00
Alex Moreno	2420c6dee2	Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-23 13:14:30 +02:00
Jon Elias	76ed5150a5	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-23 11:05:14 +00:00
Jon Elias	37b3affdbf	refactor: revert catalog changes	2024-10-23 13:02:28 +02:00
Carlos Satorres	d8b80cfa6d	fix: refs #7283 fix pr	2024-10-23 12:30:04 +02:00
Jon Elias	b69ef48a44	refactor: refs #7132 deleted pageTitles repeated	2024-10-23 12:21:34 +02:00
Jon Elias	03f2da8169	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-10-23 12:14:50 +02:00
Carlos Satorres	d2da1e3544	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-23 09:54:25 +02:00
Carlos Satorres	b40af0ce7b	fix: refs #7283 fix pr	2024-10-23 09:49:48 +02:00
Carlos Satorres	84dae53d66	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-23 07:53:02 +02:00
Javi Gallego	3cbd294168	Merge pull request '#7943 -permisosWorker' (!855) from 7349-permisosWorker into dev ... Reviewed-on: #855 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:52:48 +00:00
Javi Gallego	1bf1844c8f	fix: refs #7349 dependencia no usada	2024-10-23 07:46:52 +02:00
Javi Gallego	ae56c06628	feat: refs #7349 usa back con permisos	2024-10-23 07:45:00 +02:00
Alex Moreno	f9392464e5	Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-22 14:07:28 +02:00
Alex Moreno	ee31bc8262	chore: refs #8039 not required	2024-10-22 14:07:27 +02:00
Alex Moreno	0d3e8bb5d2	Merge branch 'dev' into 8039-canceledError_not_notify	2024-10-22 12:06:41 +00:00
Alex Moreno	dd2dc86eea	fix: refs #8039 o not handle unnecessary errors	2024-10-22 14:05:15 +02:00
Alex Moreno	cd00a3c67f	test: refs #8039 fix WorkerNotification e2e	2024-10-22 13:55:35 +02:00
Alex Moreno	0c9c01b6e9	test: refs #8039 fix ZoneWarehouse e2e	2024-10-22 13:53:01 +02:00
Alex Moreno	2d81cffb33	feat: refs #8039 show duplicate request in local	2024-10-22 13:34:20 +02:00
Alex Moreno	a732ec05fb	test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test	2024-10-22 13:21:16 +02:00
Javier Segarra	d25cdbf34e	test: refs #6943 #6943 use command correctly	2024-10-22 12:43:58 +02:00
Javier Segarra	0ba577ad04	Merge branch 'dev' into 6943_customer_spec	2024-10-22 12:37:24 +02:00
Alex Moreno	9db1c4f721	fix: refs #8039 bad tests	2024-10-22 12:29:33 +02:00
Alex Moreno	ffd4a402ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-22 12:14:09 +02:00
Javier Segarra	49c0d64c07	fix: refs #7283 #7283 ItemSummary bugs	2024-10-22 12:13:43 +02:00
Javier Segarra	fff3310658	fix: refs #7283 tooltips !Item	2024-10-22 12:09:32 +02:00
Javier Segarra	d6b8d41b6c	fix: refs #7283 #7283 ItemSummary bugs	2024-10-22 12:09:19 +02:00
Jon Elias	1346a2e7fd	fix: tag chips	2024-10-22 12:05:44 +02:00
Javier Segarra	f3a6209189	fix: refs #7283 #7283 bugs	2024-10-22 12:00:11 +02:00
Jon Elias	5b116a7301	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-22 11:31:45 +02:00
Javier Segarra	f4a7e20c57	test: refs #6943 #6943 add comands to solve tests	2024-10-21 14:31:31 +02:00
Javier Segarra	29a7f3b2fe	fix: refs #7283 #7283 ItemDiary subToolbar	2024-10-21 13:48:43 +02:00
Alex Moreno	c69f7af390	test: refs #8039 axios not notify	2024-10-21 13:38:35 +02:00
Alex Moreno	8478d89183	Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-21 13:33:14 +02:00
Alex Moreno	9780fe596f	feat: refs #8039 notify error unify	2024-10-21 13:33:12 +02:00
Alex Moreno	6f79275521	Merge branch 'dev' into 8039-canceledError_not_notify	2024-10-21 11:24:08 +00:00
Alex Moreno	52981953f7	feat(): refs #8039 canceledError not notify	2024-10-21 13:23:45 +02:00
Jon Elias	df3b4e7a18	refactor: refs #7132 deleted useless code	2024-10-21 13:07:07 +02:00
Jon Elias	1d41647022	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-10-21 12:57:32 +02:00
Jon Elias	e5cd9d4b8f	refactor: refs #7132 global translations files changed	2024-10-21 12:56:09 +02:00
Jon Elias	fa0625aa86	Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-18 14:12:25 +02:00
Jon Elias	11bf70d76c	fix: category and tags filters	2024-10-18 14:12:23 +02:00
Jon Elias	89cb9aacec	refactor: refs #7132 1st wave of changes in global translations files	2024-10-18 12:54:21 +02:00
Jon Elias	0e77d4b68f	refactor: refs #7132 account's module translations	2024-10-18 10:40:40 +02:00
Jon Elias	8eef9c0009	refactor: refs #7132 customer's module translations	2024-10-18 09:21:18 +02:00
Jon Elias	58e88f605c	refactor: refs #7132 delete duplicate translations' keys	2024-10-18 08:04:52 +02:00
Carlos Satorres	608e6c717a	fix: refs #7310 clean warning	2024-10-17 09:34:48 +02:00
Carlos Satorres	16ef5d3722	fix: refs #7306 clean warning	2024-10-17 08:30:45 +02:00
Carlos Satorres	f2cb0111eb	fix: refs #7283 fix image	2024-10-16 14:45:33 +02:00
Carlos Satorres	d1c61c5aed	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-16 14:01:01 +02:00
Guillermo Bonet	787ce2fc48	feat: refs #7006 itemTypeLog added	2024-10-14 09:33:00 +02:00
Javier Segarra	3d5d267345	revert: commit	2024-10-10 09:29:12 +02:00
Javier Segarra	f16707756e	fix: change type vnput	2024-10-10 09:29:04 +02:00
Jon Elias	d721083795	fix: filter panel	2024-10-10 08:43:33 +02:00
Jon Elias	419d3d2d45	fix: refs #6896 fixed module problems	2024-10-10 07:20:33 +02:00
Carlos Satorres	55ddc8644f	refs #7283 fix itemMigration list filters	2024-10-02 12:51:33 +02:00
Carlos Satorres	54015fb6bf	refs #7283 fix itemMigration	2024-10-01 08:44:08 +02:00
Carlos Satorres	06a1b3b409	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-01 06:30:19 +02:00
Carlos Satorres	716d018121	refs #72983 fix filters	2024-09-20 14:20:26 +02:00
Carlos Satorres	fc26fa12be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-18 13:34:14 +02:00
Carlos Satorres	db783e1538	refs #7283 item Descriptor	2024-09-17 15:03:30 +02:00
Carlos Satorres	ae97e32826	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 14:55:48 +02:00
Carlos Satorres	8c91cb42f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 11:11:57 +02:00
Carlos Satorres	1916c6e4bf	refs #7283 itemFilters	2024-09-16 14:29:39 +02:00
Carlos Satorres	70759b8a4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-16 09:28:51 +02:00
Carlos Satorres	0fcc4fe232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-13 13:50:01 +02:00
Carlos Satorres	050d8ae208	refs #7283 fix items error get images	2024-09-12 11:43:37 +02:00
Carlos Satorres	68a2ac385f	refs #7283 fix items images	2024-09-12 11:36:02 +02:00
Carlos Satorres	039a8d1d02	refs #7283 fix items	2024-09-12 09:32:41 +02:00
Carlos Satorres	b66e66eb0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:44:35 +02:00
Carlos Satorres	04c8481b51	refs #7283 fix itemFixed	2024-09-12 07:43:12 +02:00
Carlos Satorres	04070a5a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:42:55 +02:00
Carlos Satorres	dc39dd5a76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-06 13:26:34 +02:00
Carlos Satorres	dfb098d440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-02 12:32:47 +02:00
Carlos Satorres	488dc74c1f	refs #7283 itemRequest fix reload	2024-09-02 12:14:23 +02:00
Carlos Satorres	3bf3e8eeaa	refs #7283 itemRequest fix deny	2024-09-02 11:08:50 +02:00
Carlos Satorres	388036a2eb	refs #7283 itemRequest fix	2024-09-02 09:19:49 +02:00
Carlos Satorres	268a27878c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-30 13:23:42 +02:00
Carlos Satorres	a2254d145e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-29 15:40:43 +02:00
Carlos Satorres	e4aec1773b	refs #7283 itemRequest fix deny	2024-08-29 12:38:57 +02:00
Carlos Satorres	cd1b5f56f7	refs #7283 column-action	2024-08-28 11:35:57 +02:00
Carlos Satorres	98be567ead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-28 10:28:58 +02:00
Carlos Satorres	6de59c6419	refs #7283 itemRequestFixed	2024-08-27 14:39:21 +02:00
Carlos Satorres	477984076b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-27 10:55:17 +02:00
Carlos Satorres	2ef56f9f97	refs #7283 fixedPrice	2024-08-27 08:00:07 +02:00
Javier Segarra	bae0b4de35	fix: itemBotanical	2024-08-22 10:38:15 +02:00
Jorge Penadés	12a5d6cec0	fix: refs #7283 css	2024-08-19 17:05:00 +02:00
Jorge Penadés	f34f3a78cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-19 16:39:39 +02:00
Carlos Satorres	1df089cef7	refs #7283 fix itemFixedPrice	2024-08-14 15:50:13 +02:00
Carlos Satorres	589ee629cf	refs #7283 fix conflicts	2024-08-13 12:45:30 +02:00
Carlos Satorres	ec9c2fb3ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-12 14:13:26 +02:00
Carlos Satorres	6ca8ede946	refs #7283 item request	2024-08-07 09:53:42 +02:00
Carlos Satorres	fe78de0c47	refs #7283 fixedPrices	2024-08-05 11:49:06 +02:00
Carlos Satorres	b668d07e2d	refs #7283 fetchedTags	2024-08-01 13:20:33 +02:00
Carlos Satorres	2604441c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-01 10:19:26 +02:00
Carlos Satorres	f678c63043	refs #7283 request	2024-07-22 13:35:41 +02:00
Carlos Satorres	4d394a98a4	refs #7283 fix yml list basicData	2024-07-22 08:24:59 +02:00
Carlos Satorres	e647cbcf36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-07-22 06:32:11 +02:00
Carlos Satorres	86ae827fda	refs #7283 clone	2024-07-16 13:48:32 +02:00
Carlos Satorres	f29d873ed4	refs #7283 fix request	2024-07-16 12:15:39 +02:00
Carlos Satorres	339f6e810b	refs #7283 fix descriptorproxy	2024-07-16 10:34:00 +02:00
Carlos Satorres	cce1d891fb	refs #7283 fix viewSummary	2024-07-16 08:48:50 +02:00
Carlos Satorres	85b030c7bc	refs #7283 view summary	2024-07-16 08:31:04 +02:00
Carlos Satorres	b7ba8eec3d	refs #7283 fix searchbar	2024-07-16 08:24:57 +02:00
Carlos Satorres	daf99f4730	refs #7283 itemRequestList	2024-07-15 15:00:43 +02:00
Carlos Satorres	afbcd2ebda	refs #7283 item filters	2024-07-15 14:31:33 +02:00
Carlos Satorres	16b5b5d9a1	refs #7283 filter	2024-07-15 13:48:59 +02:00
Carlos Satorres	168201c755	refs #7283 itemList table	2024-07-15 12:25:54 +02:00