Commit Graph

18398 Commits

Author SHA1 Message Date
Guillermo Bonet 1a2b58af9c Merge pull request 'refs #5662 Add email modified-collection-volumetry' (!1743) from 5662-CollectionVolumetryNotify into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1743
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-10-10 07:45:38 +00:00
Carlos Satorres 1adfa33a9a hotfix length sales
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 14:52:30 +02:00
Guillermo Bonet 47747ee236 Merge branch 'dev' into 5662-CollectionVolumetryNotify
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:55:14 +00:00
Pablo Natek 23019df6fb Merge pull request 'refs #6213 fixCreateError' (!1746) from 6213-supplierFixCreateErrors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1746
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-06 06:24:02 +00:00
Pablo Natek c4e3fdf510 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:03:03 +00:00
Pablo Natek 27f473a0cc Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head Build queued... Details
2023-10-06 08:03:38 +02:00
Pablo Natek 90fe65acc2 refs #6213 fixChanges 2023-10-06 08:03:37 +02:00
Alex Moreno 402ad39d5c Merge branch 'dev' into 6260-User.password-NOT-NULL
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 05:56:58 +00:00
Carlos Satorres dea3bb7a98 Merge pull request 'refs #6282 left join' (!1784) from 6282-hotfixFreeLancer into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1784
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-06 05:43:02 +00:00
Carlos Satorres 05812c3f35 refs #6282 left join
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 07:14:30 +02:00
Carlos Satorres b8321c12c3 Merge pull request 'hotfix-change minus' (!1782) from hotfix-refundTicket into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1782
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-06 05:02:51 +00:00
Carlos Satorres 62c7dc9db5 hotfix-change minus
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:16:42 +02:00
Pablo Natek e3d23c5c42 Merge pull request 'refs #4764 hotfix' (!1780) from 4764-ticketRefundhotFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1780
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-05 13:46:29 +00:00
Pablo Natek 674fefeab5 refs #4764 ticket
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 15:43:02 +02:00
Pablo Natek 2c2fa97631 refs #4764 ticketRefound
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 15:35:59 +02:00
Pablo Natek f52a6cb0c7 refs #4764 fixReport
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 15:04:39 +02:00
Pablo Natek f40185c2d4 refs #4764 hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:24:52 +02:00
Carlos Satorres 3fbdae15b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-10-05 14:04:42 +02:00
Carlos Satorres 3b81b511c2 remove consolelog
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:01:53 +02:00
Carlos Satorres 5b6eb0a2a6 refs #5768 add address, nickname, pdf, email
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:01:07 +02:00
Juan Ferrer 903b9aa043 Merge pull request 'refs #6216 feat(ticket_sale): open filtered ticketLog' (!1772) from 6216-saleLog_open_ticketLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1772
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-10-05 11:44:59 +00:00
Pablo Natek 020de5d754 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-05 07:57:46 +00:00
Javi Gallego 726bc26a75 fixes #6260 vn-user quito campos redundantes
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 09:40:05 +02:00
Alex Moreno 8d7eda5af3 refs #5673 fix: add development translation
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 09:12:54 +02:00
Alex Moreno 7a6022efd4 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 06:31:54 +00:00
Jorge Penadés d6d95b3533 Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 06:29:26 +00:00
Jorge Penadés abd087a3e3 Merge branch '6119-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 08:20:58 +02:00
Jorge Penadés 0d39471970 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-05 08:20:47 +02:00
Alex Moreno 9538841a30 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:28:02 +02:00
Alex Moreno ca86b3cc2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:27:35 +02:00
Alex Moreno 7cd2e290ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:22:41 +02:00
Jorge Penadés 9d086f5433 Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 13:55:28 +00:00
Jorge Penadés 7431e884fc Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-04 13:54:47 +00:00
Carlos Satorres f2adbc1716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-10-04 13:54:18 +02:00
Alex Moreno f8a510b330 refs #5918 fix(workerTimeControl): update(workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 12:31:46 +02:00
Alex Moreno df6d10e514 refs #5918 fix(workerTimeControl): resend mail
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 12:17:24 +02:00
Jorge Penadés c35899542d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 08:40:44 +02:00
Pablo Natek bd974c6712 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 05:49:15 +00:00
Carlos Satorres 05e11447a5 Merge pull request 'refs #5861 edit css' (!1775) from 5861-invoiceOutSpace into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1775
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-04 05:48:57 +00:00
Pablo Natek e14049a082 refs #6213 fixJasmineConfiguration
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 07:48:00 +02:00
Carlos Satorres ed3871f75c refs #5861 edit css
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 14:03:59 +02:00
Alex Moreno 45e41de9a9 refs #5918 fix(worker_time-control): isMailSended
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 14:03:52 +02:00
Guillermo Bonet a5103c18eb Merge branch 'dev' into 5662-CollectionVolumetryNotify
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 11:39:53 +00:00
Alex Moreno 21ddcb7e8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 11:39:44 +02:00
Carlos Satorres bd46a77cb7 refs #5768 incoterms addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 10:15:16 +02:00
Alex Moreno 8c39f65dc3 refs #6067 feat: url model to everyone
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 09:36:11 +02:00
Pablo Natek 96769d9ff9 refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 08:57:59 +02:00
Alex Moreno 62fa54e02f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-03 07:26:41 +02:00
Alex Moreno 9baa450298 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 05:25:55 +00:00
Pablo Natek ca556349a8 Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 07:12:20 +02:00