22270 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	deb0f8e828	Merge branch 'dev' into 6897-entryMigration	2024-06-18 06:04:12 +00:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Ivan Mas	671290b9a0	refs #7313 delete vn.itemPackaging.workerFk	2024-06-17 16:45:51 +02:00
Guillermo Bonet	a84badff87	Merge branch 'test' into dev	2024-06-17 14:52:55 +02:00
Guillermo Bonet	9b3f67ff62	Merge branch 'master' into test	2024-06-17 14:52:40 +02:00
Guillermo Bonet	ce709798b4	hotfix: refs #7486 collection_new debug error	2024-06-17 14:51:04 +02:00
Guillermo Bonet	664f4299b3	Merge branch 'test' into dev	2024-06-17 13:42:51 +02:00
Guillermo Bonet	9df3e914bd	Merge branch 'master' into test	2024-06-17 13:42:33 +02:00
Guillermo Bonet	131b44305d	hotfix: refs #7552 item_getSimilar	2024-06-17 13:38:40 +02:00
Guillermo Bonet	39381a4a7c	Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev ... Reviewed-on: #2596 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-17 11:22:30 +00:00
Robert Ferrús	8ac11722a8	Merge pull request 'feat: refs #7296 RoutesMonitor' (!2594) from 7296-expeditionTruckRoutesMonitor into dev ... Reviewed-on: #2594 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-17 11:10:49 +00:00
Guillermo Bonet	eaaf83561c	fix: refs #5995 Optimized downloadCmrsZip	2024-06-17 13:03:02 +02:00
Jorge Penadés	4bc62a30bd	fix: refs #6744 back test	2024-06-17 12:23:01 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Robert Ferrús	ae8a8ec744	Merge branch 'dev' into 7296-expeditionTruckRoutesMonitor	2024-06-17 09:54:26 +00:00
Robert Ferrús	cfa0b87898	feat: refs #7296 RoutesMonitor	2024-06-17 11:50:25 +02:00
Guillermo Bonet	b4377e36e2	Merge branch 'test' into dev	2024-06-17 11:45:19 +02:00
Guillermo Bonet	e7eaecdf6f	Merge branch 'master' into test	2024-06-17 11:45:00 +02:00
Guillermo Bonet	4c345ffa93	hotfix: refs #7552 item_getSimilar	2024-06-17 10:57:23 +02:00
Carlos Andrés	9b118f83e5	fix: asociar ticketRefund refs #7586	2024-06-14 17:56:24 +02:00
Carlos Andrés	51078c804b	Ticket #194195 Recupero vn.item_getAtp	2024-06-14 16:32:13 +02:00
Carlos Andrés	5473f7a308	Hotfix Ticket #194195 Error radar negativos	2024-06-14 16:01:27 +02:00
Robert Ferrús	00d0703493	Merge pull request 'fix: refs #194195 item_getAtp' (!2591) from 194195-hotFixRadarNegativos into master ... Reviewed-on: #2591 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-14 12:59:43 +00:00
Robert Ferrús	39e5d7b016	Merge branch 'master' into 194195-hotFixRadarNegativos	2024-06-14 12:57:15 +00:00
Robert Ferrús	df6de7e74c	fix: refs #194195 item_getAtp	2024-06-14 14:55:03 +02:00
Jorge Penadés	202884fdce	feat: refs #6238 add travelKgPercentage table and model	2024-06-14 14:25:15 +02:00
Robert Ferrús	a54db91e74	Merge pull request 'fix: refs #194195 item_getAtp' (!2589) from 194195-hotFixRadarNegativos into master ... Reviewed-on: #2589 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-14 12:03:43 +00:00
Robert Ferrús	8dea9598e8	fix: refs #194195 item_getAtp	2024-06-14 13:54:43 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Guillermo Bonet	6c2fd2580d	Merge branch 'master' into test	2024-06-14 12:47:51 +02:00
Guillermo Bonet	798bf6d028	hotfix: refs #6281 itemShelving_add buy is required	2024-06-14 12:41:46 +02:00
Carlos Satorres	86617ec35a	Merge pull request 'warmFix change if' (!2587) from warmFix-vacationsWorkCenter into test ... Reviewed-on: #2587 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-14 08:45:51 +00:00
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
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
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +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
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
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
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