Commit Graph

21561 Commits

Author SHA1 Message Date
Alex Moreno 3f44eeb130 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 11:45:48 +00:00
David Domenech 86f340248f Merge pull request 'fix: refs #6398 Changed alias of views' (!1895) from 6398-fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1895
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-12-19 10:04:56 +00:00
Pablo Natek 4fbb7f05ec Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 09:51:36 +00:00
Pablo Natek f68529960e fix(notification): refs #6005 notification changes
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:51:18 +01:00
Guillermo Bonet 17e177b788 fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:12:03 +01:00
Carlos Satorres 18e87a05c4 refs #5525 st and nd
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 10:07:17 +01:00
David Domenech d60f2a7f88 fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 09:43:09 +01:00
Javier Segarra 5151cdca48 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:06:36 +00:00
Javier Segarra 72e9b69d7e Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:04:41 +00:00
Javier Segarra 2d4fb9d2f8 refs #5858 perf: remove unused methods
gitea/salix/pipeline/head Build queued... Details
2023-12-19 08:04:11 +01:00
Javier Segarra dbc3fc8007 refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 08:02:38 +01:00
Javier Segarra a31b689ae2 refs #5858 perf: update db/changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:54:49 +01:00
Javier Segarra 5b6112720f refs #5858 feat: new fixture 2023-12-19 07:54:29 +01:00
Javier Segarra cc88fcbd9d refs #5858 feat: update notification template 2023-12-19 07:54:12 +01:00
Javier Segarra 15936ddc55 refs #5858 other: rename files 2023-12-19 07:53:47 +01:00
Carlos Satorres 6ff7edfada Merge pull request '6220-addressFilter' (!1886) from 6220-addressFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1886
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-18 11:45:09 +00:00
Carlos Satorres 22a9ffc163 refs #6291 dni
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 12:33:04 +01:00
Carlos Satorres e4de704b4c Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 11:16:58 +00:00
Jorge Penadés 779cbd2c0a refs #6276 collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-18 11:43:15 +01:00
Jorge Penadés 5c22f51043 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-18 10:29:14 +01:00
Javier Segarra 7723b244d0 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 07:17:51 +00:00
Javier Segarra 1810377738 Merge pull request '#2051 - DMS unify methods' (!1888) from 2051_dms_methods_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1888
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-18 07:14:35 +00:00
Javier Segarra 8d650cf6c0 refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 08:09:44 +01:00
Javier Segarra 1515b55f7d Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 12:06:07 +00:00
Javier Segarra 29a7d9b941 Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 13:01:47 +01:00
Javier Segarra dc98436b85 refs #2051 perf: rename variable 2023-12-15 13:01:44 +01:00
Javier Segarra c9af8cba81 refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 12:50:05 +01:00
Javier Segarra 8d5e174a64 refs #5878 perf: move validation to other folder
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 12:39:48 +01:00
Jorge Penadés d70a3570d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-12-15 12:18:28 +01:00
Alex Moreno d47a4a7c16 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 11:12:47 +00:00
Javier Segarra 9cc2588bf4 Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2023-12-15 10:14:41 +01:00
Alex Moreno 356fe68696 refs #5914 fix: remove unnecessary translation
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 08:57:09 +01:00
Alex Moreno 59f2e3d0e6 refs #5914 fix: remove unnecessary
gitea/salix/pipeline/head Build queued... Details
2023-12-15 08:54:41 +01:00
Alex Moreno c755b1e6fa refs #5914 fix: correct sql version
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 08:50:22 +01:00
Javier Segarra 98a98e0d9e refs #2687 perf: remove force test
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 07:40:31 +01:00
Javi Gallego 3a37e6dfc8 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen 2023-12-15 07:37:29 +01:00
Javier Segarra f10cada19f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 07:35:04 +01:00
Javier Segarra b5b58faee4 refs #2687 perf: remove comments 2023-12-15 07:34:37 +01:00
Javier Segarra d9ffdaf855 refs #2687 test: use tx.rollback() 2023-12-14 16:00:29 +01:00
Alex Moreno 21a1dbeae7 refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:56:49 +01:00
Alex Moreno 1ce1af82fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2023-12-14 15:55:21 +01:00
Guillermo Bonet e89ec55839 fix: refs #6172
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:09:07 +01:00
Carlos Satorres fe184156a1 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 13:51:09 +00:00
Carlos Satorres f73f3813b3 Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 14:37:22 +01:00
Carlos Satorres bbb9f58a9e refs #6220 fix(client_filter): fix where 2023-12-14 14:37:14 +01:00
Javier Segarra 043c411f68 Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:11 +00:00
Javier Segarra 9316c31180 refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:36:36 +01:00
Javier Segarra 1939c65fab refs #6264 test: remove force describe for dms test 2023-12-14 12:35:54 +01:00
Javier Segarra d0af29c0c5 refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:28:41 +01:00
Javier Segarra d2461d67c9 refs #6264 test: perf renew-token.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:25:40 +01:00