22785 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	b117352e1a	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-19 10:31:36 +00:00
Robert Ferrús	c4d297f766	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 09:50:27 +00:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Robert Ferrús	0128dfd967	feat: refs #5855 changes required	2024-06-19 11:30:50 +02:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Pako Natek	49e01218e9	Warehouse name	2024-06-19 10:45:37 +02:00
Robert Ferrús	1e3376f908	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 08:05:01 +00:00
Robert Ferrús	a42562b0ca	fear: refs #5855 claim_ratio_routine	2024-06-19 10:01:32 +02:00
Pako Natek	c989cebbfc	Merge pull request '7420-supplierPackaging_ReportSource' (!2607) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2607 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-19 07:56:53 +00:00
Javi Gallego	637c6a9035	feat: refs #7216 logUnpaid	2024-06-19 09:40:24 +02:00
Pako Natek	bb496124ac	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-19 06:37:33 +00:00
Alex Moreno	f8407a83fe	Merge pull request 'fix: refs #6408 quito state.js' (!2608) from hotfix-stateFk into master ... Reviewed-on: #2608 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 06:17:30 +00:00
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +02:00
Pako Natek	1fa0a841da	TP previous	2024-06-19 07:26:30 +02:00
Pako Natek	cccc87d211	Merge pull request 'tickets deleted excluded' (!2601) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2601 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-19 05:17:58 +00:00
Pako Natek	bf62f40c87	actualizada la rama	2024-06-19 07:17:25 +02:00
Pako Natek	841f8e9cac	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 18:38:48 +00:00
Sergio De la torre	caec6c7f6f	Merge pull request 'hotFix delete unique refs #6281' (!2606) from 6281_hotFix_itemShelving into master ... Reviewed-on: #2606 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-18 17:08:40 +00:00
Sergio De la torre	ae01fb6440	hotFix delete unique refs #6281	2024-06-18 17:00:15 +02:00
Sergio De la torre	16d50ca2e5	Merge pull request '6964-hasItemOlder' (!2560) from 6964-hasItemOlder into test ... Reviewed-on: #2560 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 14:27:07 +00:00
Sergio De la torre	5694d9a9fe	Merge branch 'test' into 6964-hasItemOlder	2024-06-18 14:20:57 +00:00
Jorge Penadés	116ec6bba9	Merge pull request '#6238 use scheme' (!2604) from 6238-fix-useDb into dev ... Reviewed-on: #2604 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-18 11:20:16 +00:00
Jorge Penadés	6cf7c58671	fix: refs #6238 use scheme	2024-06-18 12:59:55 +02:00
Ivan Mas	b8b88cdb92	Merge pull request 'refs #7313 delete vn.itemPackaging.workerFk' (!2599) from 7313-Delete_vn.ticketPackaging.workerFk into dev ... Reviewed-on: #2599 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-18 10:10:49 +00:00
Ivan Mas	49943e4f25	Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk	2024-06-18 10:09:04 +00:00
Pako Natek	66ed958c72	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 09:07:24 +00:00
Guillermo Bonet	5e1bfc12f2	Merge branch 'test' into dev	2024-06-18 11:04:11 +02:00
Guillermo Bonet	a61c12a06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-18 11:04:01 +02:00
Guillermo Bonet	b7fadddbb1	Merge branch 'master' into dev	2024-06-18 11:03:56 +02:00
Guillermo Bonet	4d5f3e43ed	Merge branch 'master' into test	2024-06-18 11:03:49 +02:00
Guillermo Bonet	2b1de271a9	refs #7552 Added force vShowType true	2024-06-18 11:03:30 +02:00
Jorge Penadés	0bf0c6ce8c	Merge pull request '#6238 add travelKgPercentage table and model' (!2590) from 6238-addPercentage into dev ... Reviewed-on: #2590 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-18 08:41:29 +00:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Jorge Penadés	3070d1ef01	refactor: refs #6238 drop useless round	2024-06-18 10:04:21 +02:00
Jorge Penadés	87feddaedb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage	2024-06-18 09:55:22 +02:00
Carlos Satorres	52a34c8f2d	refs #7409 fix acls	2024-06-18 09:18:09 +02:00
Pako Natek	3711f26b5f	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 06:24:59 +00:00
Sergio De la torre	46cd20a1fd	feat hasItemOlder refs#6964	2024-06-18 08:24:15 +02:00
Pako Natek	9fc027a3c6	tickets deleted excluded	2024-06-18 08:24:06 +02:00
Alex Moreno	7566ca1acb	build: increase version 2428	2024-06-18 08:21:38 +02:00
Alex Moreno	65238e19ca	Merge pull request '7596-devToTest_2426' (!2600) from 7596-devToTest_2426 into test ... Reviewed-on: #2600 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-18 06:19:50 +00:00
Carlos Satorres	ac8780f47f	Merge pull request 'refs #6897 remove code redirection' (!2531) from 6897-entryMigration into dev ... Reviewed-on: #2531 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:14:16 +00:00
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
Carlos Satorres	3e25fff90f	refs #7409 acl	2024-06-17 15:50:58 +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