Commit Graph

25559 Commits

Author SHA1 Message Date
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
Sergio De la torre 379ad6a8e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-06-10 11:37:01 +02:00
Guillermo Bonet b4820858c9 hotfix: ticket 192672 ticketPreviousPreparingList 2024-06-10 11:32:44 +02:00
Carlos Satorres 1a01b3e587 refs #7529 back models acls 2024-06-10 10:42:52 +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
Guillermo Bonet 317f898c2e refactor: refs #7490 Minor changes 2024-06-10 08:48:56 +02:00
Guillermo Bonet a4f8c0df80 Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking 2024-06-10 08:47:03 +02:00
Guillermo Bonet fb4be69cf1 refactor: refs #7490 Added final update 2024-06-10 08:47:02 +02:00
Guillermo Bonet e043badc19 Merge branch 'dev' into 7490-duaInvoiceInBooking 2024-06-10 06:39:15 +00:00
Guillermo Bonet 9b21cd5eb1 refactor: refs #7490 Deleted update duaInvoiceInBooking 2024-06-10 08:38:58 +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
Carlos Satorres 23a49fb6b1 Merge branch 'dev' into 6897-entryMigration 2024-06-07 12:05:08 +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
Carlos Satorres 48550bd986 refs #6897 fix remove 2024-06-07 11:35:03 +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
Jorge Penadés 2319ab7032 Merge pull request '#6942 create invoiceIn acl' (!2556) from 6942-warmfix-setInsertAcl into test
Reviewed-on: #2556
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-07 07:13:51 +00:00
Jorge Penadés 99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl 2024-06-07 07:11:07 +00:00
Jorge Penadés 310c2383cb fix: refs #6286 replace id for reason 2024-06-07 09:08:21 +02:00
Carlos Satorres 4508f7bfff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration 2024-06-07 08:53:28 +02:00
Carlos Satorres cdc18ed84f refs #6897 fix entry Salix 2024-06-07 08:32:59 +02:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev 2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test 2024-06-07 08:29:04 +02:00
Robert Ferrús a89fde0f10 Merge pull request 'feat: refs #7496 deprecated ticket.isLabeled' (!2547) from 7496-ticketIsLabeled into dev
Reviewed-on: #2547
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-07 06:22:14 +00:00
Guillermo Bonet 70eddb6ce2 refactor: refs #7419 Added index ticketLog 2024-06-07 08:18:07 +02:00
Robert Ferrús f7c2fd824f feat: refs #7496 changesRequested 2024-06-07 07:05:22 +02:00
Jorge Penadés 1912fdd45d refactor: refs #6286 replace name 2024-06-06 17:26:23 +02:00
Jorge Penadés 5a6e2a2b31 fix: refs #6942 create invoiceIn acl 2024-06-06 15:45:39 +02:00
Robert Ferrús 1ca7b75ce3 Merge branch 'dev' into 7496-ticketIsLabeled 2024-06-06 12:33:35 +00:00
Robert Ferrús d8e6a94797 Merge branch 'dev' into 7544-claimChangeState 2024-06-06 12:31:08 +00:00