26950 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b660c82ffa	Merge branch 'dev' into 8657-app-status-pdf	2025-02-26 06:51:51 +00:00
Alex Moreno	a9ae260409	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-26 07:31:33 +01:00
Alex Moreno	e4a9ada838	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-26 07:31:18 +01:00
Alex Moreno	73d92db112	Merge pull request 'hotFix_closeAll_emailDeliveryNote' (!3496) from hotFix_closeAll_emailDeliveryNote into master ... Reviewed-on: #3496 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-25 14:07:17 +00:00
Alex Moreno	2914dfff2e	feat: add Catalan localization for email templates and footer	2025-02-25 14:59:54 +01:00
Alex Moreno	fbdc715fa5	feat: enhance ticket closing process with email notifications and error handling	2025-02-25 14:59:49 +01:00
Sergio De la torre	65c3f158f7	Merge pull request 'feat: refs#8624 addWorkerActions' (!3489) from 8624-addActionCleanShelving into dev ... Reviewed-on: #3489 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-25 08:22:30 +00:00
Carlos Satorres	380d1f69e5	Merge pull request 'fix: refs #6553 workerBusiness, workerDescriptor' (!3484) from 6553-workerBusinessV2 into test ... Reviewed-on: #3484 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-25 08:14:13 +00:00
Carlos Satorres	d6a520d81a	Merge branch 'test' into 6553-workerBusinessV2	2025-02-25 08:10:54 +00:00
Sergio De la torre	5093393f3b	Merge branch 'dev' into 8624-addActionCleanShelving	2025-02-25 06:19:12 +00:00
Alex Moreno	f2421c806a	Merge branch 'dev' into 8657-app-status-pdf	2025-02-25 06:15:56 +00:00
Jose Antonio Tubau	08cd31181b	Merge pull request 'fix: update foreign key model reference in agency-workCenter.json' (!3491) from agencyWorkCenterModelFix into dev ... Reviewed-on: #3491 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-25 06:04:52 +00:00
Jose Antonio Tubau	22a592d05f	Merge branch 'dev' into agencyWorkCenterModelFix	2025-02-25 06:02:55 +00:00
Ivan Mas	3cd76c03ef	Merge pull request 'fix: refs #8613 fk claimEnd' (!3492) from 8613-claimEnd-FK into dev ... Reviewed-on: #3492 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-24 17:17:52 +00:00
Ivan Mas	04b6be23a1	fix: refs #8613 fk claimEnd	2025-02-24 18:13:56 +01:00
Sergio De la torre	08cd2d2221	feat: refs #8624 refs#8624 addWorkerActions	2025-02-24 16:50:35 +01:00
Sergio De la torre	2941e5f80a	feat: refs #8624 refs#8624 addWorkerActions	2025-02-24 16:48:41 +01:00
Ivan Mas	3330db84fa	Merge pull request 'refactor: refs #8613 add fk to claimEnd.claimDestinationFk' (!3479) from 8613-addFkClaimDestinationFk into dev ... Reviewed-on: #3479 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-24 15:09:25 +00:00
Ivan Mas	85fb754bc9	Merge branch 'dev' into 8613-addFkClaimDestinationFk	2025-02-24 15:05:36 +00:00
Alex Moreno	3ed1d2e163	Merge branch 'dev' into 8657-app-status-pdf	2025-02-24 13:43:55 +00:00
Jose Antonio Tubau	b215938327	fix: update foreign key model reference in agency-workCenter.json	2025-02-24 14:38:52 +01:00
Alex Moreno	acf0f82d85	fix: refs #8657 test await printer server	2025-02-24 14:28:29 +01:00
Javi Gallego	dbe58c6630	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-24 13:09:57 +01:00
Javi Gallego	a021383df0	fix: update shipped property assignment in refund ticket creation	2025-02-24 13:09:53 +01:00
Alex Moreno	186219f057	Merge branch '8657-app-status-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 8657-app-status-pdf	2025-02-24 13:06:54 +01:00
Alex Moreno	909b96087f	feat: refs #8657 update application status report to display dynamic status	2025-02-24 13:06:53 +01:00
Alex Moreno	9fad296757	Merge branch 'dev' into 8657-app-status-pdf	2025-02-24 11:38:33 +00:00
Ivan Mas	218bb4db6f	Merge branch 'dev' into 8613-addFkClaimDestinationFk	2025-02-24 11:38:06 +00:00
Alex Moreno	ffbc368dc7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-24 12:35:55 +01:00
Alex Moreno	d12553bbd4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-24 12:35:46 +01:00
Alex Moreno	75b3be8b79	feat: refs #8657 add application status report and related templates	2025-02-24 12:26:17 +01:00
Ivan Mas	8e6eeca5e8	refactor: refs #8613 change on delete to restrict	2025-02-24 12:17:59 +01:00
Sergio De la torre	119ae0819b	feat: refs#8624 addWorkerActions	2025-02-24 11:07:31 +01:00
Carlos Satorres	aace7fc8ad	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusinessV2	2025-02-21 15:19:02 +01:00
Carlos Satorres	35cfce552b	fix: refs #6553 getWorkerBusiness	2025-02-21 15:14:46 +01:00
Carlos Satorres	ebfba823b0	fix: refs #6553 workerBusiness, workerDescriptor	2025-02-21 14:59:02 +01:00
Javi Gallego	532b430d2b	Merge pull request '7937-claimAgile' (!3429) from 7937-claimAgile into dev ... Reviewed-on: #3429 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-21 13:58:36 +00:00
Alex Moreno	d1053642e9	Merge branch 'dev' into 7937-claimAgile	2025-02-21 13:16:49 +00:00
Javi Gallego	4dcd3f0d76	Merge pull request 'refactor: refs #7764 add role assignment for supplier during user creation' (!3481) from 7764-createClienteAsSupplier into dev ... Reviewed-on: #3481 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-21 13:00:59 +00:00
Javier Segarra	a410432365	Merge branch 'dev' into 7764-createClienteAsSupplier	2025-02-21 12:17:20 +00:00
PAU ROVIRA ROSALENY	63568696e2	Merge pull request 'fix: #8612 handled duplicate code error in shelving & parking' (!3476) from 8612-shelvinge2e into dev ... Reviewed-on: #3476 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-21 11:59:53 +00:00
Javi Gallego	a15cf04a4c	refactor: refs #7764 include options parameter in role retrieval for user creation tests	2025-02-21 12:53:08 +01:00
Ivan Mas	726825164d	refactor: refs #8613 alter table default 1	2025-02-21 12:21:13 +01:00
Javier Segarra	74abd1db32	Merge pull request 'HOTFIX: add param shipped' (!3482) from hotfix_ticket_shipped into master ... Reviewed-on: #3482 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-02-21 11:02:39 +00:00
PAU ROVIRA ROSALENY	5d964c4e52	Merge branch 'dev' into 8612-shelvinge2e	2025-02-21 10:58:14 +00:00
Ivan Mas	69485dca75	Merge branch 'dev' into 8613-addFkClaimDestinationFk	2025-02-21 10:47:23 +00:00
Javier Segarra	581a7393d4	fix: add param shipped	2025-02-21 11:41:37 +01:00
Javi Gallego	63a36139c2	refactor: refs #7937 update test descriptions to English for clarity in importToNewRefundTicket specs	2025-02-21 11:12:13 +01:00
Guillermo Bonet	2059b8eaa6	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:48:05 +01:00
Guillermo Bonet	c80e6f3240	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:38:28 +01:00