12318 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	f2e65a7e65	Merge pull request 'fix: workerDescriptorMenu_i18n' (!1593) from fix_workerDescriptorMenu_i18n into dev ... Reviewed-on: #1593 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-03-21 09:10:26 +00:00
Javier Segarra	cc4cd5bb75	Merge branch 'dev' into fix_workerDescriptorMenu_i18n	2025-03-21 08:49:16 +00:00
Alex Moreno	88407463f5	fix: reduce parallelism in Cypress tests to improve stability	2025-03-21 09:49:00 +01:00
Javier Segarra	b1528810b2	Merge branch 'dev' into fix_workerDescriptorMenu_i18n	2025-03-21 08:02:32 +00:00
Alex Moreno	4a249b8da8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-21 07:31:26 +01:00
Jon Elias	0110ad3437	Merge pull request 'Warmfix[Submodule Descriptors]: Fixed submodule descriptors icons' (!1616) from Warmfix-SubModulesIcons into test ... Reviewed-on: #1616 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-21 06:17:18 +00:00
Jon Elias	0ff590d5bb	fix: fixed submodule descriptors icons	2025-03-20 16:30:38 +01:00
Alex Moreno	5d6784588f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-20 14:39:10 +01:00
Alex Moreno	6c84c4ae77	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-20 14:38:58 +01:00
Carlos Satorres	26ac4cf7cc	Merge pull request 'fix: refs #7323 department' (!1615) from 7323-workerDepartmentFix into master ... Reviewed-on: #1615 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-20 11:41:18 +00:00
Carlos Satorres	b2eaf7543c	fix: refs #7323 department	2025-03-20 12:25:14 +01:00
Jon Elias	0d63c4ec2c	Merge pull request 'Warmifx[CardDescriptor]: Fixed department descriptor icon' (!1612) from Warmfix-DepartmentIcon into test ... Reviewed-on: #1612 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-20 11:19:10 +00:00
Jorge Penadés	25fce95265	Merge pull request '#8581 invoiceIn e2e' (!1452) from 8581-invoiceinE2e into dev ... Reviewed-on: #1452 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-20 08:57:59 +00:00
Jon Elias	9ae89eaf93	refactor: deleted useless	2025-03-20 09:24:56 +01:00
Jorge Penadés	af3b64b86f	fix: refs #8581 update test to check cardDescriptor_subtitle instead of descriptor_id	2025-03-20 08:59:41 +01:00
Jorge Penadés	5c0f519073	Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e	2025-03-20 08:59:35 +01:00
Jon Elias	f9bb8d2a93	Merge pull request '#7869: Added include and exclude event from list' (!1574) from 7869-ModifyZones into dev ... Reviewed-on: #1574 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-20 07:39:08 +00:00
Jon Elias	5ec0da63f2	Merge branch 'dev' into 7869-ModifyZones	2025-03-20 07:01:41 +00:00
Alex Moreno	edb3c0cbce	Merge pull request '6994-vnLog_descriptors' (!1579) from 6994-vnLog_descriptors into dev ... Reviewed-on: #1579 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-03-20 06:58:19 +00:00
Alex Moreno	9f3c068245	Merge branch 'dev' into 6994-vnLog_descriptors	2025-03-20 06:46:07 +00:00
Alex Moreno	872d89339a	Merge pull request 'feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline' (!1596) from 6695-artifacts into dev ... Reviewed-on: #1596 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-03-20 06:44:03 +00:00
Alex Moreno	72d1281bde	Merge branch 'dev' into 6994-vnLog_descriptors	2025-03-20 06:20:13 +00:00
Alex Moreno	ccbd624389	Merge branch 'dev' into 6695-artifacts	2025-03-20 06:19:16 +00:00
Alex Moreno	30d287bbf6	Merge pull request '5926-refactor_docuware' (!1613) from 5926-refactor_docuware into dev ... Reviewed-on: #1613 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-18 13:59:04 +00:00
Jorge Penadés	f107684473	fix: refs #8581 update data-cy attribute concatenation in VnInputDate component	2025-03-18 14:21:16 +01:00
Alex Moreno	0160897030	Merge branch 'dev' into 5926-refactor_docuware	2025-03-18 13:20:00 +00:00
Jon Elias	42022889b2	fix: card descriptor imports	2025-03-18 14:13:01 +01:00
Jon Elias	092a338e72	fix: card descriptor merge	2025-03-18 14:03:38 +01:00
Jon Elias	fb912725b3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-DepartmentIcon	2025-03-18 14:01:53 +01:00
Jon Elias	1caa3055f3	fix: fixed department descriptor icon	2025-03-18 13:59:13 +01:00
Jon Elias	4a1b6136d8	Merge pull request 'Hotfix[SendSms]: Fixed SMS when clients do not have phone' (!1610) from Hotfix-RouteSendSms into master ... Reviewed-on: #1610 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-18 11:55:40 +00:00
Alex Moreno	c55304e1d2	refactor: refs #5926 simplify sendDocuware function to accept multiple tickets	2025-03-18 12:32:25 +01:00
Jon Elias	8ae196ac3d	Merge branch 'master' into Hotfix-RouteSendSms	2025-03-18 11:25:32 +00:00
Jon Elias	dfdb9685d2	fix: fixed sms when clients do not have phone	2025-03-18 12:09:46 +01:00
Jorge Penadés	6e801e8f64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e	2025-03-18 11:49:02 +01:00
Jose Antonio Tubau	d698275ba2	Merge pull request 'refactor: refs #8721 swap 'client' and 'street' columns' (!1608) from 8721-reorderColumnsRouteTickets into dev ... Reviewed-on: #1608 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-18 10:44:45 +00:00
Jose Antonio Tubau	6d1f1770dd	Merge branch 'dev' into 8721-reorderColumnsRouteTickets	2025-03-18 10:32:13 +00:00
Jorge Penadés	ce5be197ce	Merge branch '8581-invoiceinE2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e	2025-03-18 11:27:37 +01:00
Jorge Penadés	7ed7a38df2	fix: refs #8581 rollback	2025-03-18 11:27:35 +01:00
Jorge Penadés	bfd62eaa54	Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e	2025-03-18 11:23:01 +01:00
Jorge Penadés	c2c21098bb	Merge pull request 'feat: refs #8775 enhance VnSelect component with nextTick for improved loading handling' (!1607) from 8775-hotfix-virtualScroll into master ... Reviewed-on: #1607 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-18 09:28:43 +00:00
Jose Antonio Tubau	acbe0730bb	refactor: refs #8721 swap 'client' and 'street' columns	2025-03-18 10:15:18 +01:00
Jorge Penadés	80cb7e9075	feat: refs #8775 enhance VnSelect component with nextTick for improved loading handling	2025-03-18 10:09:10 +01:00
Alex Moreno	25799cd1da	build: init new version	2025-03-18 09:48:11 +01:00
Alex Moreno	6f87af39e4	fix: align Article label to the left in EntryBuys component	2025-03-18 09:47:13 +01:00
Alex Moreno	ce430c6a8f	chore: downgrade version from 25.14.0 to 25.12.0 in package.json	2025-03-18 09:46:16 +01:00
Pablo Natek	be7350cd34	Merge pull request '8602-refatorAndCreateEntry' (!1584) from 8602-refatorAndCreateEntry into test ... Reviewed-on: #1584 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-18 08:41:58 +00:00
Pablo Natek	551967410f	test: refs #8602 skip custom value dialog and order creation tests in OrderCatalog and OrderList	2025-03-18 09:28:14 +01:00
Pablo Natek	300d0aad22	Merge branch '8602-refatorAndCreateEntry' of https://gitea.verdnatura.es/verdnatura/salix-front into 8602-refatorAndCreateEntry	2025-03-18 09:00:38 +01:00
Pablo Natek	935ac752f5	test: refs #8602 skip ClaimDevelopment test suite	2025-03-18 09:00:36 +01:00