22291 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	8117b748b3	Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev ... Reviewed-on: #2406 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:41:19 +00:00
Alex Moreno	c9885920e7	Merge pull request 'build: dump' (!2569) from 7565-dump into master ... Reviewed-on: #2569 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-11 07:37:04 +00:00
Jorge Penadés	6b04b371f2	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:36:58 +00:00
Jorge Penadés	6aca0765c0	Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev ... Reviewed-on: #2400 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-11 07:31:03 +00:00
Alex Moreno	a446c278b4	Merge branch 'master' into 7565-dump	2024-06-11 07:17:11 +00:00
Jorge Penadés	d30cd68417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls	2024-06-11 09:11:56 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Alex Moreno	2dec51804c	build: dump	2024-06-11 08:38:26 +02:00
Alex Moreno	7adf4a373d	Merge pull request '7565-testToMaster' (!2567) from 7565-testToMaster into master ... Reviewed-on: #2567 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-11 06:31:16 +00:00
Alex Moreno	282cf96336	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster	2024-06-11 08:04:09 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Alex Moreno	2061d08bac	feat: add changelog	2024-06-10 15:54: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
Jorge Penadés	59474a9dfb	Merge pull request '#6273 register freelance' (!2403) from 6273-registerFreelance into dev ... Reviewed-on: #2403 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 13:34:50 +00:00
Jorge Penadés	8e3cc574ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 15:21:59 +02:00
Javi Gallego	e081c4504d	feat: refs #7548 link a grafana	2024-06-10 14:51:48 +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
Pablo Natek	d41f1ff561	fix: refs #6404 remove focus from test	2024-06-10 12:36:15 +02:00
Pablo Natek	65fae086aa	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-10 12:29:42 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +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	8065b8cf14	Merge pull request '4560-GastosReparto' (!2544) from 4560-GastosReparto into dev ... Reviewed-on: #2544 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-10 08:40:54 +00:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Guillermo Bonet	ddb644aded	Merge pull request 'refactor: refs #7517 Added throw' (!2562) from 7517-throwBuy_afterUpsert into dev ... Reviewed-on: #2562 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 08:03:12 +00: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
Jorge Penadés	7794f23c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 09:02:52 +02:00
Sergio De la torre	391ec435ac	Merge pull request '7276_expeditionScanned' (!2559) from 7276_expeditionScanned into dev ... Reviewed-on: #2559 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 06:36:50 +00:00
Sergio De la torre	4cf5c0775c	feat isScannedExpedition refs #7276	2024-06-10 07:30:33 +02:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Carlos Andrés	ba410360e9	Merge pull request 'Hotfix-midnight-determinist' (!2548) from Hotfix-midnight-determinist into master ... Reviewed-on: #2548 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-07 14:22:04 +00: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	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Jorge Penadés	ee1678ebb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-07 12:14:18 +02: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
Alex Moreno	379d7ef2ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-07 10:33:07 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-07 10:32:49 +02:00
Alex Moreno	60ea248b6e	Merge pull request 'fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests' (!2528) from 6147-transferInvoice_split into master ... Reviewed-on: #2528 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-07 08:17:20 +00:00
Alex Moreno	6e17f3dca3	Merge branch 'master' into 6147-transferInvoice_split	2024-06-07 08:14:38 +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