Commit Graph

9069 Commits

Author SHA1 Message Date
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Guillermo Bonet 968effc936 hotfix: ticket 135539 Unroute tickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-17 11:56:04 +02:00
Pablo Natek 1372f817bd fix: refs #7187 model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:05:22 +02:00
Pablo Natek b299e842b9 fix: refs #7187 model foreignKey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:04:21 +02:00
Pablo Natek 4cf5457690 fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:01:41 +02:00
Pablo Natek 1abacdc42b fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 14:00:42 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Alex Moreno 8260016da5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:53:07 +02:00
Carlos Satorres 4b8cad9aef hotfix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:23:36 +02:00
Carlos Satorres a4e1b1931c hotfix accessScopes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-15 12:38:30 +02:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 10:14:53 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 11:23:29 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02: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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 10:51:18 +00:00
Jorge Penadés 035782414f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:47:25 +02:00
Carlos Satorres 0f52fe65d3 refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:46:40 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Jon Elias 620dd3d836 Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 08:05:24 +02:00
Jon Elias 58aedf160b refactor: refs #6739 changed translations' keys 2024-05-09 08:05:23 +02:00
Jon Elias 0f973baa65 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:31:32 +00:00
Jon Elias 77c2f61f47 refs #6739 move petitions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:30:20 +02:00
Jon Elias 72da046ead Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 14:12:11 +02:00
Jon Elias 9d75ba0bc5 refactor: refs #6739 default params 2024-05-08 14:12:10 +02:00
Carlos Satorres 0d43d9a982 refs #6877 remove restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:20:45 +02:00
Carlos Satorres f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:27:20 +00:00
Carlos Satorres 7b298c1baf refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:24:05 +02:00
Carlos Satorres fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:21:19 +00:00
Carlos Satorres 8a7d124066 refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 12:17:44 +02:00