22854 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	e3e9706fb8	fix fixtures	2024-06-14 09:53:50 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Jon Elias	0bf384b2ce	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-14 07:06:30 +00:00
Jon Elias	d3f23a6d7a	fix: refs #6436 fix filter test	2024-06-14 09:04:18 +02:00
Jon Elias	ee75068e9c	refactor: refs #6436 fixed test	2024-06-14 08:57:11 +02:00
Jon Elias	4bb223b626	Merge branch '5447-TravelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-14 08:50:34 +02:00
Jon Elias	711fad6b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-14 08:50:32 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Robert Ferrús	08cf849b7a	Merge branch '5855-temporaryTable' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-14 08:13:11 +02:00
Robert Ferrús	741ea57b43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-14 08:13:08 +02:00
Robert Ferrús	828908a522	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:07:39 +00:00
Ivan Mas	159b69a04c	Merge pull request 'refs #7530 delete trigger deviceProductionConfig_afterUpdate' (!2586) from 7530-Remove_CAU_sending_deviceProductionConfig into dev ... Reviewed-on: #2586 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-14 06:07:18 +00:00
Robert Ferrús	831b2c39f6	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:06:54 +00:00
Carlos Satorres	33a1928f62	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-06-14 07:31:08 +02:00
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +02:00
Sergio De la torre	c2e4e187d6	feat itemShelvingSale refs #6861	2024-06-13 14:21:59 +02:00
Jorge Penadés	7717c38a45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 14:00:14 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Guillermo Bonet	961aba285e	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:12:22 +00:00
Guillermo Bonet	cfc5e32715	feat: refs #6701 Fix error	2024-06-13 13:11:50 +02:00
Guillermo Bonet	cb056ff789	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:14:00 +02:00
Sergio De la torre	5340729ead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-13 11:07:57 +02:00
Carlos Satorres	2d9092d2a5	Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-13 09:20:46 +02:00
Carlos Satorres	3c1544ac9d	refs #6897 fix es.yml	2024-06-13 09:20:43 +02:00
Robert Ferrús	5714539d78	Merge pull request 'test' (!2585) from test into dev ... Reviewed-on: #2585 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 07:18:55 +00:00
Jorge Penadés	e093808af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 09:10:36 +02:00
Robert Ferrús	31c4ace76c	Merge pull request 'master' (!2584) from master into test ... Reviewed-on: #2584 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 06:59:38 +00:00
Carlos Satorres	2dc7e75aee	Merge branch 'dev' into 6897-entryMigration	2024-06-13 06:51:09 +00:00
Robert Ferrús	78fde69c32	Merge pull request 'fix: refs #7039 supplier search-panel country' (!2583) from 7039-supplierFixCountry into master ... Reviewed-on: #2583 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 06:50:42 +00:00
Robert Ferrús	b5e139b734	fix: refs #7039 supplier search-panel country	2024-06-13 08:43:11 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Jorge Penadés	7480f5ecb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-12 16:54:03 +02:00
Carlos Andrés	30caf79490	feat: previas con sitema de reservas refs #6861	2024-06-12 16:12:06 +02:00
Jon Elias	324d7ef7ae	refactor: refs #6436 changed test config	2024-06-12 14:54:43 +02:00
Carlos Satorres	b72de3570a	refs #6897 fix redirection	2024-06-12 14:41:35 +02:00
Carlos Satorres	ba67acb72b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-12 14:33:11 +02:00
Guillermo Bonet	d0b926b2c5	feat: refs #7490 Changes	2024-06-12 14:26:26 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Guillermo Bonet	dcb9d54105	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:48:01 +02:00
Alex Moreno	3ca71b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 10:38:02 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	a6d2029dc0	Merge pull request 'fix(updateQuantity): fix rocket translation' (!2581) from 6408-hotFix_updateQuantity into master ... Reviewed-on: #2581 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-12 08:10:10 +00:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	b31a38e03b	Merge pull request 'fix(sale): rocket is only sent if it has sales' (!2580) from 6408-hotFix_sales_length into master ... Reviewed-on: #2580 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-12 07:33:53 +00:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Alex Moreno	8dcd04384b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 08:39:59 +02:00