7498 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	9e75d16976	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-29 08:56:19 +00:00
Robert Ferrús	68c691587d	feat: refs #8001 change request	2024-11-29 09:55:22 +01:00
Guillermo Bonet	bf8b9e4283	Merge branch 'test' into dev	2024-11-29 09:48:43 +01:00
Guillermo Bonet	8428c7a205	fix: refs #7920 Changed shelving option value	2024-11-29 09:48:09 +01:00
Robert Ferrús	4f8bf00786	Merge pull request 'feat: refs #245362 itemTags' (!1017) from 245362-hotFixItemTags into master ... Reviewed-on: #1017 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-29 07:42:15 +00:00
Robert Ferrús	bedf7d8a3a	Merge branch 'master' into 245362-hotFixItemTags	2024-11-29 07:39:40 +00:00
Robert Ferrús	3c026c9b28	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-29 07:39:33 +00:00
Robert Ferrús	87b5af7060	feat: refs #8001 change request	2024-11-29 08:38:38 +01:00
Alex Moreno	50796df06a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-29 07:28:06 +01:00
Alex Moreno	36de1ad400	fix(MailForwarding): add try catch	2024-11-29 07:27:14 +01:00
Robert Ferrús	650acccbee	Merge branch 'master' into 245362-hotFixItemTags	2024-11-29 04:53:09 +00:00
Javier Segarra	7a3e2c0a9b	Merge pull request 'fix: remove message when setWeigth ticket' (!1019) from setWeight_modal into master ... Reviewed-on: #1019 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-28 13:06:00 +00:00
Javier Segarra	280a70a145	fix: remove message when setWeigth ticket	2024-11-28 14:05:04 +01:00
Jon Elias	ddfcc0aff5	Merge pull request 'Hotfix: delete event and dated value when excluding a day' (!1010) from Hotfix-ZoneEventsExclusion into master ... Reviewed-on: #1010 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-28 12:51:44 +00:00
Jon Elias	4193710123	Merge branch 'master' into Hotfix-ZoneEventsExclusion	2024-11-28 12:43:41 +00:00
Jon Elias	6263481a3e	refactor: exclusionCreate function and translations	2024-11-28 13:42:22 +01:00
Javier Segarra	d74bad50cb	Merge pull request 'HOTFIX #8217 Update Customer Credit' (!986) from hotfix_8217_updateCustomerCredit into master ... Reviewed-on: #986 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-28 12:34:11 +00:00
Javier Segarra	07274002cf	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-28 12:33:07 +00:00
Jon Elias	61d0d71538	fix: fixed functionality like Salix	2024-11-28 12:26:33 +01:00
Robert Ferrús	547455d976	Merge branch 'master' into 245362-hotFixItemTags	2024-11-28 10:38:00 +00:00
Robert Ferrús	97c12bced3	feat: refs #245362 change request	2024-11-28 11:36:59 +01:00
Javier Segarra	1bbce5f828	Merge pull request 'HOTFIX: ticketSale keyup.enter' (!1009) from hotfix_ticketSale_enter into master ... Reviewed-on: #1009 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-28 10:03:40 +00:00
Robert Ferrús	8b26cc61a5	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-28 09:44:43 +00:00
Javier Segarra	8bc3c1610b	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-28 08:39:18 +00:00
Robert Ferrús	5c79c6bfef	feat: refs #245362 itemTags	2024-11-28 09:38:28 +01:00
Guillermo Bonet	7315d117c0	Merge branch 'test' into dev	2024-11-28 09:01:17 +01:00
Guillermo Bonet	41fb880c0e	fix: refs #7266 Minor fixes	2024-11-28 08:59:13 +01:00
Alex Moreno	1ae53791bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-28 08:41:58 +01:00
Alex Moreno	a251e348a8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-28 08:41:56 +01:00
Guillermo Bonet	4af309ce8d	Merge branch 'test' into dev	2024-11-28 08:36:36 +01:00
Javier Segarra	8daa08b99c	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-28 07:35:46 +00:00
Alex Moreno	fe34eefc55	Merge pull request 'fix: not fetch on mounted' (!1015) from hotfix-notRedirectOnLoad into master ... Reviewed-on: #1015 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-28 07:34:21 +00:00
Alex Moreno	118e346a07	Merge branch 'master' into hotfix-notRedirectOnLoad	2024-11-28 07:32:52 +00:00
Guillermo Bonet	55b9e3ddcd	fix: refs #7266 Bad report	2024-11-28 08:21:09 +01:00
Jon Elias	aaab41fe97	fix: translations	2024-11-28 07:37:50 +01:00
Jon Elias	b2e99230b3	Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion	2024-11-28 07:21:04 +01:00
Jon Elias	1a0406b5b1	fix: fixed exclusionCreate when excluding an event already excluded	2024-11-28 07:21:02 +01:00
Javier Segarra	c287c04894	Merge pull request '#8061 Improve_newCP' (!1016) from 8061_improve_newCP into dev ... Reviewed-on: #1016 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-11-28 05:52:26 +00:00
Javier Segarra	89a2486f62	fix: refs #8061 improve code dependencies	2024-11-27 23:33:39 +01:00
Javier Segarra	3a695bdfe1	perf: refs #8061 use opts from VnSelect	2024-11-27 22:42:18 +01:00
Javier Segarra	507b78f5e8	perf: refs #8061 filter autonomy	2024-11-27 22:33:00 +01:00
Javier Segarra	827f6032b6	Merge pull request 'test: Order catalog tests' (!1008) from wbuezas/salix-front-mindshore-fork2:feature/CatalogTests into dev ... Reviewed-on: #1008 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-27 20:02:34 +00:00
William Buezas	63f0db459c	test: change file name and path	2024-11-27 16:17:37 -03:00
Javier Segarra	38d8dbab8e	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-27 18:28:20 +00:00
Javier Segarra	844d72a2e3	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-27 18:20:41 +00:00
Javier Segarra	e23c6bc144	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-27 18:19:59 +00:00
Javier Segarra	a7f5c13acf	Merge branch 'master' into Hotfix-ZoneEventsExclusion	2024-11-27 18:15:05 +00:00
Jorge Penadés	33de645e37	fix: not fetch on mounted	2024-11-27 17:02:41 +01:00
Jon Elias	5889dbf3de	Merge pull request 'Hotfix: fixed ref filter in InvoiceOutList' (!1014) from Hotfix-InvoiceOutRefFilter into master ... Reviewed-on: #1014 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-27 13:16:30 +00:00
Jon Elias	d2cee10141	Merge branch 'master' into Hotfix-InvoiceOutRefFilter	2024-11-27 13:13:57 +00:00