5090 Commits

Author	SHA1	Message	Date
Javier Segarra	9f7df66119	Merge branch 'dev' into 5926_pda_worker_docuware	2024-06-17 10:09:28 +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	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	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +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
Javier Segarra	00b8d30916	Merge branch 'dev' into 5926_pda_worker_docuware	2024-06-12 22:29:54 +02:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Alex Moreno	2dec51804c	build: dump	2024-06-11 08:38:26 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Alex Moreno	c241189508	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-10 14:22:12 +02:00
Guillermo Bonet	75a529830c	Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ... Reviewed-on: #2564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 11:33:10 +00:00
Guillermo Bonet	9d82f0ff7c	Merge branch 'test' into dev	2024-06-10 12:48:53 +02:00
Guillermo Bonet	37fa92aca8	Merge branch 'master' into test	2024-06-10 12:48:38 +02:00
Guillermo Bonet	272a34c5f9	refactor: refs #7486 Added userFk debug	2024-06-10 12:46:26 +02:00
Guillermo Bonet	7579e15fcc	refactor: refs #7486 Optimized procs	2024-06-10 11:55:40 +02:00
Guillermo Bonet	b4820858c9	hotfix: ticket 192672 ticketPreviousPreparingList	2024-06-10 11:32:44 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Javier Segarra	82fcc157be	Merge branch 'dev' into 5926_pda_worker_docuware	2024-06-10 09:55:11 +02:00
Guillermo Bonet	ca7d67451b	refactor: refs #7517 Minor changes	2024-06-10 09:09:11 +02:00
Guillermo Bonet	2e8d28d795	refactor: refs #7517 Added throw	2024-06-10 09:08:26 +02:00
Sergio De la torre	4cf5c0775c	feat isScannedExpedition refs #7276	2024-06-10 07:30:33 +02:00
Carlos Andrés	1497146940	Merge branch 'master' into Hotfix-midnight-determinist	2024-06-07 16:17:11 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	521f3f1446	feat: refs #6243 update ACL	2024-06-07 11:52:24 +02:00
Jorge Penadés	96a3a2e69b	fix: refs #6243 rollback	2024-06-07 11:50:16 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Jorge Penadés	44e92964f1	Merge pull request 'test to dev' (!2558) from test into dev ... Reviewed-on: #2558 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:19:31 +00:00
Sergio De la torre	7c0fa6dbb9	feat isScannedExpedition refs #7276	2024-06-07 09:18:52 +02:00
Jorge Penadés	99e4808ae9	Merge branch 'test' into 6942-warmfix-setInsertAcl	2024-06-07 07:11:07 +00:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Guillermo Bonet	70eddb6ce2	refactor: refs #7419 Added index ticketLog	2024-06-07 08:18:07 +02:00
Robert Ferrús	f7c2fd824f	feat: refs #7496 changesRequested	2024-06-07 07:05:22 +02:00
Jorge Penadés	5a6e2a2b31	fix: refs #6942 create invoiceIn acl	2024-06-06 15:45:39 +02:00
Javier Segarra	0ffbe75a01	feat(salix): refs #5926 #5926 updates	2024-06-06 15:36:19 +02:00
Robert Ferrús	1ca7b75ce3	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-06 12:33:35 +00:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02:00
Ivan Mas	a8f5993c21	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-06 10:12:45 +00:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00