Commit Graph

9085 Commits

Author SHA1 Message Date
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Javier Casado d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll 2024-05-21 05:50:49 +00:00
Robert Ferrús 823e8fd7a1 feat: refs #7296 requested changes3 2024-05-20 13:27:38 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2 2024-05-20 13:19:01 +02:00
Robert Ferrús 996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop 2024-05-20 10:31:13 +00:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes 2024-05-20 12:28:27 +02:00
Alex Moreno 9cba2be00d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-05-20 11:31:24 +02:00
Alex Moreno f82b105430 fix: TicketLog res.data 2024-05-20 11:30:43 +02:00
Carlos Satorres 6d66c0f71f hotfix TicketLog filter 2024-05-20 11:14:30 +02:00
Robert Ferrús e67981b382 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop 2024-05-20 06:44:31 +00:00
Carlos Satorres cbbd488674 Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev
Reviewed-on: #2474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 06:27:33 +00:00
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Carlos Satorres dd7ee27e9b refs #7396 fix worker model 2024-05-17 14:28:28 +02:00
Javier Casado 5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll 2024-05-17 12:08:41 +00:00
Guillermo Bonet 968effc936 hotfix: ticket 135539 Unroute tickets 2024-05-17 11:56:04 +02:00
Pablo Natek 1372f817bd fix: refs #7187 model 2024-05-16 14:05:22 +02:00
Pablo Natek b299e842b9 fix: refs #7187 model foreignKey 2024-05-16 14:04:21 +02:00
Pablo Natek 4cf5457690 fix: refs #7187 remove focus on spec 2024-05-16 14:01:41 +02:00
Pablo Natek 1abacdc42b fix: refs #7187 method 2024-05-16 14:00:42 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-16 13:57:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda 2024-05-16 10:23:33 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop 2024-05-16 10:20:08 +02:00
Alex Moreno 8260016da5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-05-15 13:53:07 +02:00
Carlos Satorres 4b8cad9aef hotfix accessScopes 2024-05-15 13:23:36 +02:00
Carlos Satorres a4e1b1931c hotfix accessScopes 2024-05-15 12:38:30 +02:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Javi Gallego 0894cbd38c Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev
Reviewed-on: #2422
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-14 13:45:11 +00:00
Sergio De la torre edb024a1f9 refs #6106 hotFix: getTickets 2024-05-14 10:14:53 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country 2024-05-14 06:32:45 +00:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country 2024-05-14 05:49:39 +00:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-05-13 14:24:31 +02:00
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker 2024-05-13 12:02:17 +00:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Jorge Penadés 5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 13:20:32 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Carlos Satorres ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail 2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e 2024-05-13 11:23:29 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev 2024-05-13 08:30:20 +02:00
Javier Casado 03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll 2024-05-13 05:40:25 +00:00
Jorge Penadés cbb7cb18eb fix: refs #5919 delete locker field 2024-05-10 16:02:50 +02:00
Alex Moreno a7910d9894 hotFix(invoiceInPdf): fix accessScopes 2024-05-10 14:58:52 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country 2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Jon Elias 6207d79244 Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev
Reviewed-on: #2412
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-10 04:51:41 +00:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Carlos Satorres fcd1b5e351 Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev
Reviewed-on: #2427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-09 10:53:10 +00:00
Robert Ferrús 0498b425b3 Merge branch 'dev' into 7039-country-country 2024-05-09 10:51:18 +00:00