Commit Graph

10182 Commits

Author SHA1 Message Date
Alex Moreno 23b544c1ec refs #6635 fix: add translation
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 08:19:48 +01:00
Pablo Natek 847623f9c6 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:28:46 +00:00
Pablo Natek b42aed13c4 Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:15:29 +00:00
Javi Gallego 2fb60aeed3 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 15:37:05 +01:00
Javi Gallego ab341b9b5e test: refs #3979 test de clone 2024-01-03 15:36:39 +01:00
Alex Moreno 227afbe39d refs #5914 fix(invoiceOut_descriptorMenu): transalation
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 14:54:01 +01:00
Alex Moreno af784522c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 14:52:16 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Carlos Satorres 3fbead7473 refs #6291 fix tinIsValid
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:44:20 +01:00
David Domenech 3c1237f727 refs #6456
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:37:18 +01:00
Guillermo Bonet a6ebd01ebd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 13:28:23 +01:00
Jorge Penadés 1f77559519 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:53:12 +01:00
Sergio De la torre 0b5ffcc81c refs #6276:modify back silex→salix 2024-01-03 12:50:53 +01:00
Alex Moreno ba26237998 refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:19:28 +01:00
Guillermo Bonet f73a447391 refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 11:57:49 +01:00
Jorge Penadés 4e951263c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 11:55:37 +01:00
Jorge Penadés 5dc49d226a refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 10:13:56 +01:00
Alex Moreno 121caee93a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 09:53:52 +01:00
Jorge Penadés 23854cb103 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 09:02:52 +01:00
Jorge Penadés b086da1936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:57:46 +01:00
Alex Moreno 399ca694ab Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:38:01 +01:00
Alex Moreno f607719efe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2024-01-03 08:34:00 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Carlos Satorres 69739fca9c refs #5919 locker relation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 08:17:37 +01:00
Pablo Natek c116bc56c3 refactor(clientSms): refs #6259 redirect to lilium 2024-01-02 19:37:51 +01:00
Jorge Penadés 31c282ac0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 14:50:26 +01:00
Guillermo Bonet 176cbe1537 Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:02:16 +00:00
Alex Moreno 1e3a7e5f91 refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:17:10 +01:00
Javier Segarra 295124e0af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries 2024-01-02 12:59:50 +01:00
Jorge Penadés 924fe12a93 add root: refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 12:44:12 +01:00
Sergio De la torre 365e05d560 refs #6276:mdify back silex→salix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 12:21:25 +01:00
Javier Segarra b11b0642f8 Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-02 11:03:52 +00:00
Guillermo Bonet 7cfcb17aff Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:50:00 +00:00
Jorge Penadés 6b8a4a512b adding filter: refs #6606
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:42:50 +01:00
Javier Segarra 4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:26:18 +00:00
Jorge Penadés 68ef193a19 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
2024-01-02 09:58:30 +01:00
Jorge Penadés 3bd14095fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:45:44 +01:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Jorge Penadés 763af7da2d fix test: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:58:41 +01:00
Alex Moreno dd02a932ef Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 06:40:18 +00:00
Jorge Penadés 15ec91ec79 fix query: refs #6369
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 14:05:01 +01:00
Pablo Natek ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 12:44:24 +01:00
Jorge Penadés 1b8461034e using hasAnyNegative: refs #6515
gitea/salix/pipeline/head This commit looks good Details
2023-12-29 12:40:48 +01:00
Carlos Satorres 3a429a31da refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 08:44:42 +01:00
Carlos Satorres 6ceee45b13 refs #5919 fix locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:40:13 +01:00
Pablo Natek f7ec64f3c1 merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:00:23 +01:00
Jorge Penadés 567879d64e corrective back created: refs #4466
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 15:55:11 +01:00
Carlos Satorres bfb31ad7c3 refs #5525 supplier
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 11:46:34 +01:00
Carlos Satorres c77715d865 refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 15:03:10 +01:00
Jorge Penadés a89d1e883a create rectification: refs #4466
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 14:36:58 +01:00
Carlos Satorres f35b2a4905 refs #5919 back chooseLocker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 13:44:52 +01:00
Carlos Satorres aa33c28468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 12:15:43 +01:00
Pablo Natek 5a1c4ddea0 refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 08:20:13 +01:00
Jorge Penadés 86db5a931d arrange test suites: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 10:44:21 +01:00
Pablo Natek 35750bc93f merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:46:12 +01:00
Pablo Natek 27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:34:22 +01:00
Carlos Satorres c4ff4c1984 refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 15:07:03 +01:00
Jorge Penadés 0998b5bf2c add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 13:58:33 +01:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Javier Segarra 100936d40b Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 12:05:27 +00:00
Carlos Satorres 73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI 2023-12-21 12:38:58 +01:00
Guillermo Bonet 0f20f95dc5 refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 10:08:17 +01:00
Jorge Penadés f5cc2cd75b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:38:33 +01:00
Alex Moreno 7b65ebb58b Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:50:45 +00:00
Javier Segarra adc7608b25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:40:42 +01:00
Javier Segarra 5c5be788c1 refs #5499 feat: trigger for all changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:08:11 +01:00
Guillermo Bonet 5f83fc158c Merge branch 'dev' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 13:03:57 +00:00
Jorge Penadés 5d75592627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 12:19:10 +01:00
Javier Segarra acb0ec508f refs #5499 feat: claimObservation 2023-12-20 12:09:01 +01:00
Javier Segarra 01e6e7dc39 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 11:02:00 +00:00
Juan Ferrer 10bfafdd3c Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 09:05:53 +00:00
Alex Moreno 351a12204a Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 08:07:30 +00:00
Guillermo Bonet 753c6e9ec5 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:28:54 +01:00
Guillermo Bonet 516a3760a1 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:27:13 +01:00
Alex Moreno 7777696cf7 refs #6589 fix(worker_absences): fix started hours
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 13:58:08 +01:00
Javier Segarra 3e30e77728 Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 12:57:59 +01:00
Javier Segarra 38a5337f68 refs #5858 test: execute test 2023-12-19 12:57:10 +01:00
Javier Segarra 243319b113 refs #5858 feat zoneIncludedCheck model 2023-12-19 12:55:27 +01:00
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
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
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 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 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
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 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 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 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
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
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
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 dddc749744 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 11:05:00 +00:00
Javi Gallego 26a05a4840 fix: refs #3979 si se abona un abono sin almacen no falla
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 09:14:21 +01:00
Alex Moreno e7911738c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 08:50:20 +01:00
Jorge Penadés 1f2d475f05 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-14 08:41:45 +01:00
Javier Segarra 397eb4d32b Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 06:22:22 +00:00
Javier Segarra 485968037b Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 06:22:17 +00:00
Sergio De la torre af83519ee6 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:12:39 +00:00
Jorge Penadés 36a9b0eee4 refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 16:00:07 +01:00
Javier Segarra 1e89ed6cdc Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 14:39:10 +00:00
Javier Segarra 06bae44824 refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 15:38:46 +01:00
Carlos Satorres 9a5536a3a3 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:05:51 +00:00
Carlos Satorres cfa08963fb 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-13 15:05:43 +01:00
Carlos Satorres 40499e44cf refs #6220 remove concat 2023-12-13 15:05:41 +01:00
Robert Ferrús 4df2fa8ee4 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 13:30:53 +00:00
Robert Ferrús b9efbc7d44 refs #5854
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:30:29 +01:00
Javier Segarra 7b9e3b0985 refs #2051 perf: removeFile after review 2023-12-13 14:24:05 +01:00
Carlos Satorres 6416891918 refs #6291 tinIsValid worker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 13:55:31 +01:00
Javier Segarra 7bdb1b2078 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor 2023-12-13 13:49:38 +01:00
Javier Segarra a5ecec9603 refs #2051 feat: remove front methods refactor 2023-12-13 13:47:30 +01:00
David Domenech 9bcd0a3c98 Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:29:46 +00:00
Jorge Penadés 8d61473d4f refs #6276 fixtures & itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 11:43:19 +01:00
Jorge Penadés a4c3d78e31 refs #6276 drop fixtures & fix getSale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 09:45:01 +01:00
David Domenech ee6ad55e66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 09:43:20 +01:00
Jorge Penadés 64c10f3b8e refs #6276 sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:52:43 +01:00
Pablo Natek f63b26b71f Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:52:36 +00:00
Carlos Satorres 371a202230 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 07:51:23 +00:00
Pablo Natek 69dd34665f refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 08:50:17 +01:00
Jorge Penadés 01fa0b1d36 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-13 08:35:11 +01:00
Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 06:30:14 +00:00
Sergio De la torre 435819cf3c refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:24:13 +01:00
Javier Segarra d44cdcbd13 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 06:14:55 +00:00
Robert Ferrús 5f4adab017 refs #5854
gitea/salix/pipeline/head Build queued... Details
2023-12-12 18:03:09 +01:00
Jorge Penadés 9e6fac9add refs #6276 change to boolean
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 16:00:43 +01:00
Sergio De la torre e22201c840 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 14:50:25 +00:00
Javier Segarra d206c93305 refs #2051 feat: getAllowedContentTypes approach
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 15:03:00 +01:00
Jorge Penadés 7b81630b85 refs #6276 shelvingLog_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 14:56:58 +01:00
Javier Segarra 6b70f8b3eb refs #2051 feat: uploadFile approach 2023-12-12 13:49:14 +01:00
Jorge Penadés f5ee3aff7a refs #6276 remove checking visible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:43:15 +01:00
Jorge Penadés 3109f7722e refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:24:18 +01:00
Carlos Satorres 78aa25d74f refs #6220 fix testback
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 13:21:08 +01:00
Carlos Satorres 6cefc982e4 refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:14:41 +01:00
Javier Segarra ae76776245 refs #2051 feat: removeFile approach 2023-12-12 12:09:06 +01:00
Javier Segarra 8bd9becb74 refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 07:34:20 +01:00
Javier Segarra 30dbc8a587 refs #2687 feat: fix test suite 2023-12-12 07:33:08 +01:00
Robert Ferrús 9894591aa9 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 17:56:40 +00:00
Javier Segarra c0d2e0511d refs #2687 feat: modify back method 2023-12-11 14:54:12 +01:00
Carlos Satorres 7e6f311a43 refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:51:11 +01:00
Carlos Satorres c81ca94d2e refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:44:33 +01:00
Jorge Penadés 84270587cb refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:42:19 +01:00
Jorge Penadés 8acd03f115 refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:01:34 +01:00
Javier Segarra f817551a57 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:59:02 +01:00
Carlos Satorres 2beb1f65f0 refs #6085 findOne
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:45:55 +01:00
Javier Segarra d1f0557923 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:40:16 +01:00
Carlos Satorres 53ff8784ff refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:16:46 +01:00
Carlos Satorres 57ed36cdfc ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 09:43:38 +01:00
Carlos Satorres 584f3264ed refs #6085 refactor sql trad 2023-12-11 08:54:58 +01:00
Jorge Penadés e27bf2ef8b 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-11 08:29:35 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00
Alex Moreno f874faa921 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 07:47:55 +01:00
Pablo Natek 5a99408ba7 feat: refs #6548 add buyer department to salesPerson list in client BasicData
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:31:57 +01:00
Jorge Penadés b88d61e864 Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl 2023-12-07 14:53:33 +01:00
Jorge Penadés 6fb4e86777 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD 2023-12-07 14:47:31 +01:00
Jorge Penadés 968dc65231 refs #6274 tests created 2023-12-07 14:47:22 +01:00
Sergio De la torre 9937fbed5e REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 11:59:01 +01:00
Sergio De la torre 67994188ee Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:42:30 +00:00
Sergio De la torre fa65cc84a9 REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 11:39:22 +01:00
Sergio De la torre 0263d880ca refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:00:17 +01:00
Carlos Satorres 3c9c221220 Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 06:59:38 +00:00
Sergio De la torre c9bcd672c9 refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 07:59:21 +01:00
Carlos Satorres c7d960229d Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:34:32 +00:00
Carlos Satorres acfa0fd857 Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:31:21 +00:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Jorge Penadés bb186bafe0 Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl 2023-12-05 14:12:00 +01:00
Javier Segarra a7c48b6ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 13:02:34 +01:00
Javier Segarra 035b31d878 refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 12:00:31 +01:00
Jorge Penadés 25006a938b refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 11:53:27 +01:00
Carlos Satorres f55e85a189 refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 10:35:48 +01:00
Carlos Satorres af07a531ed refs #6318 quantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:49:55 +01:00
Sergio De la torre 3692021b12 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 07:26:22 +00:00
Sergio De la torre 318f7e3c0d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:20:55 +01:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
Javier Segarra 57add7abf0 refs #5666 perf: replace Role by VnRole 2023-12-05 07:16:12 +01:00
Jorge Penadés 8cb97e2477 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-04 15:09:44 +01:00
Javier Segarra a8b0a7a5b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 14:46:21 +01:00
Javier Segarra e3379b42a1 refs #5858 test: bad test calls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 14:06:28 +01:00
Carlos Satorres 6d486fbec9 refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:58:45 +01:00
Jorge Penadés 1dfdd94584 refs #6276 fix getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:56:43 +01:00
Jorge Penadés 4690dca4f9 refs #6276 getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:54:09 +01:00
Pablo Natek bec1ff71ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk 2023-12-01 13:43:27 +01:00
Jorge Penadés 660e77be55 refs #6276 updateFromSale refactored
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 12:48:21 +01:00
Jorge Penadés 7e57640758 refs #6276 itemShelving_updateFromSale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 11:43:07 +01:00
Jorge Penadés d2769f4c21 refs #6276 return fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 11:38:30 +01:00
Robert Ferrús 2a93dcf5b8 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-01 10:20:08 +00:00
Jorge Penadés f2ab44bb8f refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 10:14:32 +01:00
Jorge Penadés 30b63f577f 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-01 09:49:49 +01:00
Jorge Penadés d5f09c2f75 refs #6276 saleTrackingDel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:44:49 +01:00
Javier Segarra db06620d7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:39:47 +01:00
Jorge Penadés 3333c83702 refs #6276 WIP itemShelving_return
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 16:25:13 +01:00
Jorge Penadés 611b45bae0 Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 15:16:18 +00:00
Alex Moreno b2e7ea3089 refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 15:16:41 +01:00
David Domenech eb0766bafd Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 14:08:47 +00:00
Pablo Natek 72283005b8 remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:43:14 +01:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:39:26 +00:00
Jorge Penadés 40236fdb7b refs #6276 itemShelvingMake_multi
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 13:23:10 +01:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Alex Moreno 35e74a7635 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:48:27 +01:00
Alex Moreno 016e4ae37c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-11-30 12:20:50 +01:00
Javier Segarra 01e7135224 refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 12:20:05 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +01:00
Javier Segarra 2a2998a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin 2023-11-30 12:01:44 +01:00
Jorge Penadés 25a0ffcfde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:49:50 +01:00
Jorge Penadés 6121eeaa3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:44:05 +01:00
Carlos Satorres 9cdb7c3cca refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:18:00 +01:00
Jorge Penadés 5442e3b4e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 08:44:41 +01:00
Javier Segarra 97d7f8356f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken 2023-11-30 07:08:23 +01:00
Javier Segarra 1576ab992d refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:36:30 +00:00
Jorge Penadés 0d558fb4f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head Build queued... Details
2023-11-29 16:26:10 +01:00
Javi Gallego d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 15:26:51 +01:00
Carlos Satorres 9a3efdd6fe refs #6085 model y back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:55:44 +01:00
Jorge Penadés 877c679273 refs #6276 getVersion
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:22:44 +01:00
Jorge Penadés 133fe1065a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:44:09 +01:00
Jorge Penadés c609f6f47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:27:50 +01:00
Carlos Satorres e548ef4dae refs #6085 searchpanel and change path
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-29 07:51:58 +01:00
Carlos Satorres 0186c2c806 refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 07:33:49 +01:00
Jorge Penadés 29fb36010c refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 14:48:03 +01:00
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 13:22:17 +01:00
Jorge Penadés f2673c3818 refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-28 12:12:42 +01:00
Guillermo Bonet 1a5cc67312 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 12:07:50 +01:00
Javi Gallego 2fa56cce4b fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 09:22:00 +01:00
Javier Segarra bb9723b65d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:18:11 +01:00
Javier Segarra f5f2896cbf refs 5666 feat: replace Role model by VnRole model 2023-11-28 08:12:16 +01:00
Pablo Natek b713a32fe1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:12:06 +01:00
Alex Moreno 37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 15:10:00 +01:00
Juan Ferrer c7291e3367 Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1863
2023-11-27 12:17:11 +00:00
Juan Ferrer 74772472d5 Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-27 12:16:42 +00:00
Robert Ferrús 5f26553092 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:05:50 +00:00
Robert Ferrús 62fab4e744 refs #5854 itemShelving traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:52:37 +01:00
Guillermo Bonet 3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 09:06:17 +00:00
Guillermo Bonet aefff68c29 refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:51:56 +01:00
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Javier Segarra 72a0932e35 refs #6264 other: rename camel-case variable 2023-11-27 09:46:27 +01:00
Alex Moreno 3fb1ed9dfe Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 08:38:17 +01:00
Carlos Satorres f9d5cad412 refs #6506 contract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 07:57:18 +01:00
Alex Moreno 824ca1d70a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 07:42:50 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +01:00
Javier Segarra 4383ebd7f1 refs #5858 feat: email notification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 12:30:44 +01:00
Jorge Penadés 53c8e87b5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:57:32 +01:00
Jorge Penadés 8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 10:53:38 +01:00
Jorge Penadés c56588a472 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:18:47 +01:00
Jorge Penadés b3584d9db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:12:45 +01:00
Carlos Satorres 5d18c211a0 refs #6507 state
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:40:06 +01:00
Javi Gallego 4071c06b5f feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:15:39 +01:00
Carlos Satorres 8a568f180a refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:47:57 +01:00
Carlos Satorres ebe467f721 refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:04:55 +01:00
Javi Gallego aa0794e136 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 06:31:25 +01:00
Jorge Penadés e314a67fe7 refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 13:25:31 +01:00
Jorge Penadés cf3b5efee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 12:36:19 +01:00
Jorge Penadés 6b2c1e09de refs #5835 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:31:00 +01:00
Javi Gallego 5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:29:53 +01:00
Jorge Penadés 048e3089cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:26:41 +01:00
Jorge Penadés db15285858 refs #5811 test updated
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:21:56 +01:00
Jorge Penadés 2e67ef4f5d refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:32:07 +01:00
Jorge Penadés 900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:26:28 +01:00
Pablo Natek b261e9987a Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 10:10:11 +01:00
Pablo Natek 754150d17d feat(operator.spec): refs #6005 add spec for delay and fix spec for spam 2023-11-23 10:10:09 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Javi Gallego 5b289ec083 Merge branch 'dev' into 6028_route_getRouteByWorker 2023-11-23 09:21:44 +01:00
Pablo Natek 68dca67442 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 07:33:46 +00:00
Pablo Natek a35a790155 remove(getVideo.spec.js): refs #6005 created task to review the spec
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:33:30 +01:00
Jorge Penadés da7b670d74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:28:56 +01:00
Alex Moreno f4fabb9fff refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 08:26:14 +01:00
Pablo Natek 1b4ce1a0b5 feat(noSpam): refs #6005 check if exists a previous notification 2023-11-23 08:22:24 +01:00
Carlos Satorres 2b455488a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 18:35:16 +01:00
Carlos Satorres 6b07ee4eb1 hotfix workerhours 2023-11-22 18:35:14 +01:00
Javi Gallego e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:54:38 +01:00
Jorge Penadés 26a8cc6a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:41:24 +01:00
Jorge Penadés a60a30128c 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-11-22 15:40:11 +01:00
Javi Gallego e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 12:42:20 +01:00
Javi Gallego a0a9e299d9 feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 12:39:21 +01:00
Guillermo Bonet d52c82fb19 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 11:36:07 +00:00
Pablo Natek 8dae2919e8 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 09:38:20 +00:00
Jorge Penadés 40bbad04c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 10:16:12 +01:00
Jorge Penadés a27bb53089 refs #5835 getTotals fixed
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 08:57:45 +01:00
Carlos Satorres 7c6798c564 refs #6291 dni vn-user
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 16:25:48 +01:00
Jorge Penadés 251578146e refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 12:32:36 +01:00
Jorge Penadés 67fa60ae81 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-11-21 12:27:13 +01:00
Jorge Penadés 3f8d1ff617 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:17:31 +01:00
Guillermo Bonet b3d1c72adc Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:41 +00:00
Alex Moreno e909c2bc26 Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:17 +00:00
Alex Moreno 02e8b90926 refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:12:07 +01:00
Juan Ferrer bf7c67dbde fix: refs #6197 add definer to events
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:26:02 +01:00
Jorge Penadés dd11cf5327 ref #5835 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:03:25 +01:00
Jorge Penadés 34e5409533 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 08:19:11 +01:00
Juan Ferrer 0a2fd9cf5d fix: refs #6432, #5848 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 18:39:37 +01:00
Alex Moreno ee1a0c15ee refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 15:09:55 +01:00
Guillermo Bonet 5fdf18825c Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 13:14:51 +00:00
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Alex Moreno 0ddfb28327 refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 07:56:15 +01:00
Guillermo Bonet badb4d69a2 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:15:40 +00:00
Pablo Natek e2a2454d4e Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 10:31:35 +00:00
Pablo Natek dc100f7959 fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 11:29:57 +01:00
Juan Ferrer bb6f3b4cfd fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 08:56:25 +01:00
Guillermo Bonet 500eb22dc6 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 06:43:58 +00:00
Guillermo Bonet 8da36569f7 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued... Details
2023-11-17 07:44:43 +01:00
Guillermo Bonet 3d1c69be56 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 07:43:32 +01:00
Guillermo Bonet 2f611391b9 Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good Details
This reverts commit bfd6e1f398.
2023-11-17 07:17:29 +01:00
Juan Ferrer c2e295f777 fix: refs #6432 account sync fixes 2023-11-17 00:08:29 +01:00
Juan Ferrer ea5a881d1f fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:10:30 +01:00
Juan Ferrer 1937560118 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:07:30 +01:00
Juan Ferrer 4f5242e3ae fix: refs #6432 account sync fixes 2023-11-16 23:07:26 +01:00
Javier Segarra 9e64939810 refs #6434 feat: add Id property in model 2023-11-16 11:56:48 +01:00
Alex Moreno b8d256e4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:58:51 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:29:53 +01:00
Javier Segarra e4f7790843 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 09:15:01 +01:00
Javier Segarra c6b5d7f5a4 refs #6434 feat: rename id key by token 2023-11-16 08:30:01 +01:00
Guillermo Bonet bfd6e1f398 refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:29:00 +01:00
Alex Moreno 5bdf6a7338 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 07:56:23 +01:00
Javier Segarra 13720291b2 refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 15:18:02 +01:00
Alex Moreno ac3d23579a Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:21 +00:00
Carlos Satorres 5b587b3449 Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:56:45 +00:00
Javier Segarra e0f6d08a1e refs #6434 feat: create signInLog table 2023-11-15 13:49:41 +01:00
Sergio De la torre a5d94b3a26 Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:43:58 +00:00
Alex Moreno 89967b8538 fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 13:16:31 +01:00
Sergio De la torre 692c5eb164 refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 12:38:08 +01:00
Guillermo Bonet 2847b993d3 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:30:23 +00:00
Javier Segarra f7b0882978 refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:50:56 +01:00
Javi Gallego a4328e607e Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:11:05 +01:00
Javi Gallego 3f7663da97 feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:09:04 +01:00
Javier Segarra 4061241650 refs #6434 feat: create signInLog table 2023-11-15 09:37:03 +01:00
Alex Moreno 2a67048594 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:54:47 +01:00
Alex Moreno 88ec0f24c3 ref #5914 rename table
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:45:52 +01:00
Pablo Natek 2a57f7e98a Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 14:02:27 +00:00
Pablo Natek 0a5e8e1902 refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 14:49:54 +01:00
Carlos Satorres f3faf37e1a hotfix addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 12:34:00 +01:00
Carlos Satorres b57106af48 refs #6291 validateTin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 11:13:33 +01:00
Alex Moreno 2cd9c9c688 Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:36:47 +00:00
Alex Moreno bc6389fd66 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:00:12 +00:00
Alex Moreno aec1c9d447 fix: correct align
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 09:54:07 +01:00
Guillermo Bonet 4003e161ce Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:44:06 +00:00
Guillermo Bonet 64ca72b1f4 refactor refs #6184 Changed downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:57:25 +01:00
Javier Segarra 384b5eb7c7 refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:56:16 +01:00
Javier Segarra aab88dc7de refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-13 09:54:12 +01:00
Guillermo Bonet 2792efa9cd perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 08:36:05 +01:00
Javier Segarra 3c5af184bb refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 15:12:49 +01:00
Carlos Satorres c5c314eb43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:59:01 +01:00
Guillermo Bonet a4cbc33ee1 Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:55:38 +01:00
Guillermo Bonet b7da144967 feat: refs #6023 Added SELECT FOR UPDATE 2023-11-10 11:55:37 +01:00
Guillermo Bonet eb98de71b1 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 10:49:38 +00:00
Carlos Satorres a1c8bba4a5 hotfix addressId
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 11:29:18 +01:00
Alex Moreno 0fed5c1ab4 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 09:59:24 +00:00
Alex Moreno 2eacf7391e refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 08:46:49 +01:00
Alex Moreno e9666a5930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-10 08:11:52 +01:00
Jorge Penadés 40b9a83606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:59:12 +01:00
Jorge Penadés 8d94a94e14 ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:56:50 +01:00
Jorge Penadés 513562955b ref #5835 test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:53:41 +01:00
Jorge Penadés 52f1843580 ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:00:49 +01:00
Jorge Penadés 0baa9c5a98 ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:34:53 +01:00
Jorge Penadés b07858fddb ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:33:46 +01:00
Guillermo Bonet 05a7498219 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:14:21 +00:00
Guillermo Bonet 0771548ef1 refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 14:14:09 +01:00
Guillermo Bonet 9668468f94 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:06:55 +00:00
Pablo Natek 1e4f778ef9 refactor(main-labeler): refs #6005 refactor de mainLabeler a backupPrinterFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:22:12 +01:00
Jorge Penadés 01d3c23cf0 ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 11:57:52 +01:00
Alex Moreno 52f419d4cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-11-09 09:33:22 +01:00
Pablo Natek c00bbe070c Merge branch 'dev' into 6005-backupLabeler 2023-11-09 09:26:13 +01:00
Sergio De la torre 4258015c07 refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 08:04:38 +01:00
Pablo Natek 9c896c835f refactor(printer-notification): refs #6005 refactor de la notificación 2023-11-09 07:56:35 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Sergio De la torre d30c4e4463 refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good Details
2023-11-07 16:13:21 +01:00
Pablo Natek 1c6618d494 fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued... Details
2023-11-06 14:56:48 +01:00
Pablo Natek aa800b1fd3 Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:23:38 +01:00
Pablo Natek a75565f2ce feat(client.create): refs #6150 clientCredit update fix 2023-11-06 14:23:36 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good Details
2023-11-05 09:33:18 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno a523e32373 refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 07:57:53 +01:00
Jorge Penadés d0975f0acd ref #6276 operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-02 16:25:25 +01:00
Sergio De la torre 728838334c hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:42:22 +01:00
Pablo Natek 2d3ee4a16e Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 13:05:31 +00:00
Pablo Natek 175e73e565 fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:05:14 +01:00
Alex Moreno 740d2fb976 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-02 08:48:03 +01:00
Alex Moreno 83b9ef72fc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:47:44 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Carlos Andrés 8c1ff26de7 Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 11:12:40 +00:00
Robert Ferrús 6112c7ba5f refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 09:59:34 +01:00
Pablo Natek a47d31cec9 Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 06:48:53 +00:00
Alex Moreno 37dce99447 refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 15:00:05 +01:00
Pablo Natek e504ad313c remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 14:56:33 +01:00
Alex Moreno a80715583c refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 14:16:25 +01:00
Jorge Penadés ab0640291b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 08:25:41 +01:00
Alex Moreno bd8cc897c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-30 07:21:31 +01:00
Pablo Natek 14753212bb fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:07:17 +02:00
Pablo Natek 65a1d052dc feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:03:40 +02:00
Sergio De la torre 7ae12327f5 refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 16:16:22 +02:00
Alex Moreno ae160890a8 refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-27 15:06:20 +02:00
Pablo Natek 42bbdf9814 feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 13:41:32 +02:00
Pablo Natek 524ac4d99d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges 2023-10-26 22:16:06 +02:00
Pablo Natek 3584b15c19 Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-10-26 22:10:35 +02:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno 6b94ea7d11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-26 09:48:35 +02:00
Jorge Penadés 3a1227bdc2 ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:20:25 +02:00
Jorge Penadés da2bc416f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:26:35 +02:00
Alex Moreno 013b010c22 refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 07:56:57 +02:00
Alex Moreno 26bdbabff5 refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-25 15:48:19 +02:00
Alex Moreno a501d577f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:23:00 +02:00
Alex Moreno efa9f16452 fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:22:44 +02:00
Carlos Andrés 001d7cd574 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 15:03:38 +00:00
Jorge Penadés 9f141238bc ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 11:47:54 +02:00
Alex Moreno 5442476f05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-24 10:35:11 +02:00
Jorge Penadés 35bb949fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 10:13:38 +02:00
Jorge Penadés f1deeb69ca ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:34:04 +02:00
Alex Moreno 22b7c59812 refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:23:03 +02:00
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:34:42 +02:00
Carlos Andrés 08431e94c6 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 13:52:52 +00:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Alex Moreno 247aa5af2a refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:52:06 +02:00
Alex Moreno cf856a585b refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:50:00 +02:00
Jorge Penadés 1f0a57d320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 09:03:15 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Jorge Penadés 33656e9d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 08:21:32 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:55:30 +00:00
Pablo Natek 8597c23fb3 Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:53:57 +02:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Alex Moreno 1eabad7f4b refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:37:44 +02:00
Pablo Natek 75cfea4a2e Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:18:43 +00:00
Pablo Natek 25c13e42ab Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 11:36:24 +02:00
Pablo Natek 243a32dff5 remove(expand): quito expand de la columna requester refs #6278 2023-10-20 11:36:11 +02:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno 84aed7ca21 refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:26:56 +02:00
Alex Moreno d5f98700e7 refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 08:32:35 +02:00
Pablo Natek 9cb4e57951 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 05:31:12 +00:00
Pablo Natek dc93328bcf Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 18:24:04 +02:00
Pablo Natek 07fa011035 fix(updateClaim): el spec daba error refs #5979 2023-10-19 18:24:03 +02:00
Pablo Natek dad67539c5 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 16:23:34 +00:00
Carlos Andrés 16f20cea70 refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 15:12:06 +02:00
Pablo Natek f26595bb62 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:15:43 +00:00
Alex Moreno a0e32cf455 Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:05:25 +00:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Pablo Natek 71182d8630 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:49:31 +00:00
Alex Moreno 1ea6b87266 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:48:51 +00:00
Juan Ferrer 39a0f13500 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:14:29 +00:00
Guillermo Bonet 1b8f227c47 ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:58:15 +02:00
Pablo Natek e2f7ce8b35 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:58:50 +00:00
Alex Moreno 3294937b54 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:50:29 +00:00
Jorge Penadés e680a6a080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:00:43 +02:00
Jorge Penadés 15890e80d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:59:19 +02:00
Jorge Penadés 52b14cf8b4 ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:51:10 +02:00
Jorge Penadés 5b1e5743b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:35:37 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 06:51:50 +00:00
Javi Gallego 84fc0de4ea Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 06:41:43 +00:00
Pablo Natek d3a7b4ecb9 remove: console.log from updateClaim refs #5979 2023-10-19 08:41:26 +02:00
Pablo Natek f8889df903 remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:37:28 +02:00
Jorge Penadés 770aa60b69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:26:22 +02:00
Jorge Penadés 7e25fac3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:25:00 +02:00
Jorge Penadés 8917821ec0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:23:44 +02:00
Alex Moreno daaf076133 Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 05:29:43 +00:00
Alex Moreno da20697052 refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 15:19:26 +02:00
Javi Gallego 44ce0a8730 refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:46:41 +02:00
Jorge Penadés 8fe911ee0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:43:22 +02:00
Jorge Penadés 62d2c7e701 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:42:15 +02:00
Jorge Penadés ea5597d3f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:40:02 +02:00
Jorge Penadés af0d5072ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:37:14 +02:00
Pablo Natek 3e96b3d0d2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 11:24:03 +00:00
Jorge Penadés 330fb08aac ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:23:00 +02:00
Pablo Natek bf09f13aa2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 11:07:24 +00:00
Pablo Natek 44bc30adf7 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:35:53 +00:00
Pablo Natek 2bb4300e1b remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:35:45 +02:00
Pablo Natek 34c9d030e9 Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:31:12 +00:00
Pablo Natek 5f49a4fe1d fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:25:47 +02:00
Pablo Natek 1920a1b893 merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:23:23 +02:00
Jorge Penadés 251d71a437 ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 12:05:33 +02:00
Alex Moreno a84f6fe1da Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:05:04 +02:00
Jorge Penadés 700caac641 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:03:07 +02:00
Alex Moreno 4300b24c14 refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:45:15 +02:00
Alex Moreno d1cb2a1d9a refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:30:36 +02:00
Alex Moreno a7b0ef1e4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend 2023-10-18 09:23:55 +02:00
Alex Moreno b3c7511e59 refs #6067 feat(url): getByUser 2023-10-18 08:52:06 +02:00
Alex Moreno a916007314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:20:34 +02:00
Pablo Natek 8d44bb8867 refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 15:05:48 +02:00
Jorge Penadés 69a54be1a9 ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 14:02:08 +02:00
Pablo Natek 541926d3f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded 2023-10-17 13:57:32 +02:00
Pablo Natek 9870a0e60a feat(origin): create method url_/geturl redf #5979 2023-10-17 13:56:49 +02:00
Carlos Satorres fd64cb7e80 refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 13:08:00 +02:00
Alex Moreno d4770c525e refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 11:00:41 +02:00
Jorge Penadés 48003b5d03 ref #6138
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 08:28:15 +02:00
Pablo Natek 4f911e644c fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:43:03 +02:00
Pablo Natek afe4c676fc fix(url): la ulr termina con / no es necesario añadir el texto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:38:33 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:24:58 +02:00
Jorge Penadés bd535374d8 ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:58:25 +02:00
Alex Moreno 093431ecdf refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 15:27:10 +02:00
Alex Moreno 9e39e96cf4 hotFix: workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:22:33 +02:00
Carlos Satorres 5a375ebfda refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 13:22:36 +02:00
Alex Moreno f79e711617 refs #6199 test: updateQuantity refactor
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 10:19:33 +02:00
Alex Moreno b769fa9bcf refs #6199
gitea/salix/pipeline/head This commit looks good Details
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
2023-10-16 10:10:57 +02:00
Jorge Penadés 3af72e1439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-16 08:20:20 +02:00
Jorge Penadés ab6c58cd12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 08:18:00 +02:00
Pablo Natek f832c1d9ec refs #5979 getUrl 2023-10-15 11:08:33 +02:00
Sergio De la torre f6bf36d46a Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 14:02:25 +00:00
Alex Moreno ab1cc34015 refs #6199 feat(sale): best quantity restriction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 15:14:48 +02:00
Alex Moreno 03687cb482 hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 14:56:56 +02:00
Jorge Penadés 9ba3c9c8bc Merge branch 'dev' into 5914-transferInvoiceOut 2023-10-13 11:17:12 +00:00
Jorge Penadés 6b8a6c7a69 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 11:15:04 +00:00
Alex Moreno f00a4e63a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 13:08:54 +02:00
Javi Gallego 0081c55b9e Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 10:56:33 +00:00
Carlos Andrés 9c0334619d refs #6199
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 11:56:50 +02:00
Alex Moreno fa90132934 refs #6199 fix(orderCatalogView): html and css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 10:23:48 +02:00
Guillermo Bonet 7367656a35 refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 09:02:40 +02:00
Sergio De la torre 35c0ec0d04 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 15:14:13 +00:00
Guillermo Bonet c79f706cdc Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 12:23:39 +00:00
Guillermo Bonet 3e70cb07e0 refs #6184 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:20:35 +02:00
Javi Gallego 393d1889f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:06:32 +02:00
Javi Gallego df9d6fd6f8 efectue con acento 2023-10-11 14:06:28 +02:00
Carlos Satorres 38bf90da66 refs #5919 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 13:26:27 +02:00
Guillermo Bonet c0089b1fa0 refs #6184 Added cmrFk in ticket model
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 12:20:30 +02:00
Carlos Satorres cba8a48d18 Merge branch 'dev' into 5768-incoterms
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 10:05:45 +00:00
Carlos Satorres 0023561acb refs #6293 traducción
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 12:04:12 +02:00
Guillermo Bonet d9339af87e refs #6184 Insert in ticketCmr
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 11:46:56 +02:00
Guillermo Bonet 3e522b08b6 refs #6184 Added saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 11:43:21 +02:00
Guillermo Bonet 6b1dded222 refs #6199 Requested change, position of input
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 08:28:52 +02:00
Guillermo Bonet d41233efaf refs #6199 Requested change, name of color
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 07:59:05 +02:00
Guillermo Bonet 2b41bf7eb1 refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 07:39:41 +02:00
Carlos Satorres c061841cac refs #5919 locker and back
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:58:33 +02:00
Guillermo Bonet d2ce920f13 refs #6199 Added minQuantity in catalog and more
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-10 13:49:11 +02:00
Carlos Satorres 3c58f86c2a refs #5919 locker back y front
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:44:22 +02:00
Carlos Satorres 4adee11c63 refs #5768 remove comment
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 12:35:34 +02:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 11:30:53 +02:00
Guillermo Bonet 03afea3b8e refs #6199 Added minQuantity in item
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-10 10:51:02 +02:00
Carlos Satorres 1adfa33a9a hotfix length sales
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 14:52:30 +02: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
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 62c7dc9db5 hotfix-change minus
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:16:42 +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
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
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 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
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
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
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
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 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 7fd2d143c3 refs #6213 devMerge 2023-10-03 07:08:29 +02:00
Alex Moreno 4545a63214 refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-02 14:51:19 +02:00
Pablo Natek 99d65804e8 refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 13:29:39 +02:00
Jorge Penadés 918cff55d9 Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 10:06:08 +02:00
Jorge Penadés c59b119a4a ref #5417 fix transactions 2023-10-02 10:06:04 +02:00
Jorge Penadés a00cf557b7 Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 07:57:25 +00:00
Jorge Penadés 2eb9a97ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-02 09:28:41 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:14:30 +02:00
Jorge Penadés a7128b8187 ref #5417 fix transactions
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:04:43 +02:00
Jorge Penadés cb2ac21349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-02 08:49:27 +02:00
Jorge Penadés 5f93df26a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-10-02 08:21:09 +02:00
Alex Moreno d3706733e4 Merge branch 'master' into 5929-hotFix_canEdit_weekly
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:06:55 +00:00
Alex Moreno 7b8518ff5a Merge branch 'dev' into 6033-vnLog_userDescriptor
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:04:26 +00:00
Jorge Penadés 6f4a12e50f ref #5417 date filters added
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 14:42:47 +02:00
Jorge Penadés 3e9d01815a Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 10:30:44 +00:00
Alex Moreno a0d705683b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-29 12:22:42 +02:00
Alex Moreno 53ab694ad4 Merge branch 'dev' into 5890--itemShelvingAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:18:34 +00:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:57:25 +02:00
Jorge Penadés 9536fdba58 ref #6119 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:10:58 +02:00
Alex Moreno a0a59b672f refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:04:57 +02:00
Pablo Natek 0fa56149d7 refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:47:22 +02:00
Alex Moreno 542119983b refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:28:23 +02:00
Jorge Penadés f1dc809147 Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 06:22:51 +00:00
Jorge Penadés 4d226d9a58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-09-29 08:20:16 +02:00
Jorge Penadés d4e78ea889 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-29 08:16:12 +02:00
Alex Moreno f3c55cdee9 refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 16:00:09 +02:00
Carlos Andrés 52cba80dc8 Merge branch 'dev' into 5890--itemShelvingAsignado 2023-09-28 15:13:37 +02:00
Alex Moreno 1d4001f520 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 12:04:11 +00:00
Alex Moreno 28dfb895ca refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:49:58 +02:00
Jorge Penadés 4b213c1c9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:31:45 +02:00
Alex Moreno e51df063d3 refs #5890 feat: add userId in rawSql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:26:05 +02:00
Alex Moreno 75e54bd82f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado 2023-09-28 13:21:12 +02:00
Jorge Penadés e209ab28f4 ref #6065 first time hours load fixed
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 11:53:09 +02:00
Jorge Penadés 869bdab7ce ref #6065 fetchHours relocated
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 11:36:03 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:18:15 +02:00
Sergio De la torre 4048627c76 refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:08:40 +02:00
Sergio De la torre 18de92f9e7 refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 07:51:54 +02:00
Sergio De la torre a86469ccd2 refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 07:42:44 +02:00
Sergio De la torre ac3e9c811d refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-27 14:01:17 +02:00
Jorge Penadés a7c0949f0e ref #6065 replace then by async/await
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-27 08:57:31 +02:00
Alex Moreno d313f6ea5c Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 12:59:32 +00:00
Sergio De la torre 2ea2943eca refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 13:12:18 +02:00
Jorge Penadés e1e225a1ef Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 12:42:47 +02:00
Jorge Penadés 50543963c1 ref #5914 refactor createTicketRefund 2023-09-26 12:42:45 +02:00
Jorge Penadés 45fbe6f174 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 06:36:44 +00:00
Alex Moreno e36f98195c refs #6033 feat: create user-photo component for worker and user descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 08:15:19 +02:00
Jorge Penadés db8dc8487b ref #6246 replace name
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:28:08 +02:00
Jorge Penadés 474399b383 ref #5914 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:23:51 +02:00
Alex Moreno 7a3d3d5e2a 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-09-25 14:14:23 +02:00
Jorge Penadés 64eb216367 ref #5914 fixed back test 2023-09-25 14:01:40 +02:00
Jorge Penadés f4ce5db93b Merge branch 'dev' into 6246-checkTicketSales
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 11:49:18 +00:00
Alex Moreno eb0e6dd985 refs #6033 feat(VnLog): can use accountDescriptor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 13:06:28 +02:00
Jorge Penadés 98ee9bbaf3 ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 12:54:31 +02:00
Alex Moreno d05106cc83 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 10:10:21 +00:00
Jorge Penadés c8c06f498c ref #5914 fixed tests e2e
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 10:49:47 +02:00
Alex Moreno 6cf1095b10 refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 08:33:16 +02:00
Pablo Natek af8773612c refs #6213 remove f
gitea/salix/pipeline/head Build queued... Details
2023-09-25 08:23:59 +02:00
Pablo Natek fc4019ad69 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-09-25 08:23:25 +02:00
Pablo Natek 9b10a2904c refs #6213 unifyTest 2023-09-25 08:23:23 +02:00
Jorge Penadés 731bad5981 ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 14:52:56 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:51:20 +02:00
Alex Moreno d43b70c971 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:30:28 +02:00
Alex Moreno cf36b10763 refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:29:48 +02:00
Alex Moreno db7f72e262 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-22 13:19:35 +02:00
Pablo Natek ed157d1fd1 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 11:11:25 +00:00
Alex Moreno d16ae47712 Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 11:01:25 +00:00
Jorge Penadés 6fe52ba3e8 ref #6246 check sales and update test
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 12:48:54 +02:00
Sergio De la torre ed1d8ca94f refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 12:29:56 +02:00
Carlos Satorres 5b22314b07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-09-22 12:17:23 +02:00
Jorge Penadés 6bc9b7b232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-22 12:05:12 +02:00
Pablo Natek a854fff94f refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 10:59:48 +02:00
Carlos Satorres c7f84ad6db refs #5843 add return
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 10:36:51 +02:00
Pablo Natek c175bcfc97 refs #6159 rename spec
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:40:37 +02:00
Pablo Natek 1357b60b9b refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:14:08 +02:00
Carlos Satorres c7e26f9155 refs #5768 autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 06:08:07 +02:00
Jorge Penadés 82f14e62ad ref #5914 tests fixed
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 16:08:55 +02:00
Alex Moreno a78348f2de refs #6067 feat(account_basicData): use vnUser/preview
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-21 15:06:14 +02:00
Carlos Satorres 7b246b1bac refs #5768 trad choose address
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 13:15:00 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 09:14:46 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 07:32:19 +02:00
Pablo Natek 324b3ed8ee Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 05:21:06 +00:00
Jorge Penadés 5b818cef0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 15:25:20 +02:00
Alex Moreno 3b90d7e5e5 refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 15:10:28 +02:00
Carlos Satorres f60b6b84fe refs #5843 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 11:58:36 +02:00
Carlos Satorres f92acdfe6f Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 09:52:32 +00:00
Jorge Penadés 4870b0830b ref #5914 fix refund and change method name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 11:06:30 +02:00
Pablo Natek d29c37693d Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:53:53 +00:00
Jorge Penadés 87cee57e56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 10:47:53 +02:00
Javi Gallego 72a8256aee Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1756
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-09-20 06:27:21 +00:00
Javi Gallego 29a186fa18 Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued... Details
2023-09-20 08:18:46 +02:00
Guillermo Bonet e2229b6762 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:18:24 +02:00
Guillermo Bonet 4ccb09d057 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:18:03 +02:00
Javi Gallego 45cf1b1ff3 fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 08:12:07 +02:00
Guillermo Bonet 56c1dbc096 Merge branch 'master' into 5995-getExternalCmrRouteFk
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:42:46 +00:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Guillermo Bonet 2686fd0601 refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:18:46 +02:00
Guillermo Bonet 77b55e5b09 refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:15:23 +02:00
Guillermo Bonet 661563a2b6 refs #6210 Refactor filter client (zoneFk) 2023-09-19 12:14:55 +02:00
Pablo Natek 971d77a198 refs #6213 specChangeId
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 07:46:44 +02:00
Pablo Natek 361c2b4cad refs #6213 fixSpec
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-19 07:33:28 +02:00
Alex Moreno 2dbd711104 Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 05:24:05 +00:00
Pablo Natek aef34165d2 refs #4131 reverse claim changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 13:57:17 +02:00
Alex Moreno 656492b9a6 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 10:40:26 +00:00
Carlos Satorres cfd080530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-18 11:49:03 +02:00
Guillermo Bonet f6d46396b5 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 08:15:43 +00:00
Pablo Natek c1da4815cb Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 08:12:08 +00:00
Pablo Natek cdf0951a1b refs #6213 newSuplierSpec
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 10:12:32 +02:00
Guillermo Bonet 6c34421413 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 10:03:31 +02:00
Pablo Natek 44ec197ea0 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 06:56:48 +00:00
Jorge Penadés 32a0aedf11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-18 08:07:27 +02:00
Pablo Natek 55b53c86c4 refs #6213 formatfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 07:38:31 +02:00
Sergio De la torre 881a1ee0b8 refs #5652 modify: solved Tests
gitea/salix/pipeline/head This commit looks good Details
2023-09-15 11:24:17 +02:00
Sergio De la torre 0403c67bad Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-15 05:47:00 +00:00
Carlos Satorres 2a1e828e14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-15 07:30:46 +02:00
Pablo Natek 191b254acc Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 16:05:25 +00:00
Sergio De la torre b756d2f938 refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 18:03:30 +02:00
Pablo Natek cf138a0814 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 13:15:52 +00:00
Pablo Natek a44e5206a7 refs #6213 fixConcatBug
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 14:18:00 +02:00
Javi Gallego eff0975eb2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 10:27:03 +02:00
Javi Gallego 82631d6fcd claimingRate divide por 100 2023-09-14 10:26:59 +02:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 09:05:55 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 07:47:10 +02:00
Pablo Natek 66e851b5ea refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:48:58 +02:00
Pablo Natek 7ab8cb37cd ref #6213 fixformat
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:22:21 +02:00
Pablo Natek 72026332ba Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 13:07:38 +00:00
Carlos Satorres 12dff3e248 Merge branch 'dev' into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 08:52:59 +00:00
Javi Gallego 7bd3bfddc3 fix sin bankEntity ya no falla
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 07:07:22 +02:00
Pablo Natek 740514c5a8 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-12 13:46:58 +00:00
Sergio De la torre 1d25355423 refs #5652 fix:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 08:44:42 +02:00
Pablo Natek 6a753d26af refs #6213 default account value
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 18:28:47 +02:00
Sergio De la torre 5f5a0645be refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:16:49 +02:00
Pablo Natek cbaf6001a8 refs #6213 remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:36:42 +02:00
Pablo Natek ccfd8fad05 refs #6213 fixCreateError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:32:46 +02:00
Carlos Satorres a29b25cffd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 10:48:38 +02:00
Carlos Satorres 544259df9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-11 10:47:21 +02:00
Javi Gallego 08e97b6a19 Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1728
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-09-11 07:00:20 +00:00
Jorge Penadés 48a6bf2969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-08 08:05:17 +02:00
Carlos Satorres c2f73eb548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-09-07 13:38:38 +02:00
Carlos Andrés 4784e71350 refs #6176 book entry deleted
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 13:21:03 +02:00
Jorge Penadés 427425a750 ref #6119 simplifiy component
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 09:50:13 +02:00
Carlos Andrés 0465c2ca54 Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 19:27:02 +00:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Sergio De la torre 8218eb2a6b refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head This commit looks good Details
2023-09-06 09:37:41 +02:00
Sergio De la torre dd1f759e20 refs #5652 feat:itemTrash_new 2023-09-06 09:35:43 +02:00
Sergio De la torre 2fffa56d70 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 09:18:28 +02:00
Javi Gallego 6a4d8fbfbf Merge branch 'dev' into 6173-dump-BBDD
gitea/salix/pipeline/head This commit looks good Details
2023-09-05 13:48:35 +02:00
Carlos Satorres 7025326e06 Merge branch 'dev' into 6044-fixTickCalendar
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 10:31:08 +00:00
Javi Gallego c2d8e1c002 fixes #6173 show just buyUltimate items
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 12:14:52 +02:00
Carlos Andrés 40468b70e6 refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:59:55 +02:00
Javi Gallego ed25bd93d6 fixes #6173 lastItemBuy muestra articulos sin podu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:13:29 +02:00
Jorge Penadés f46d6355dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-04 08:06:47 +02:00
Jorge Penadés 52d698b0eb ref#6119 link fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:38:35 +02:00
Sergio De la torre 022d3d08e6 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:34:33 +02:00
Sergio De la torre 3795404789 Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 10:15:26 +00:00
Guillermo Bonet 979315aa5e refs #5995 Implemented downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 12:10:39 +02:00
Jorge Penadés 9eff7c509f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 12:06:49 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Carlos Satorres 9b971abb55 refs #6044 class scss
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 11:49:08 +02:00
Guillermo Bonet cab3548c9b Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 06:11:08 +00:00
Sergio De la torre 00201197cc Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 05:24:55 +00:00
Sergio De la torre 7d8828e604 refs #6132 fix: saveSign without route
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 13:50:31 +02:00
Carlos Satorres 017e0dd948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-31 13:29:34 +02:00
Jorge Penadés c2a54b8c65 ref #6119 vnLinkPhone created
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 13:02:56 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Javi Gallego ea5e10faed Merge pull request 'test' (!1730) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1730
2023-08-31 07:58:48 +00:00
Guillermo Bonet 0dbb77fc64 refs #6023 Transactioned sync
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 09:20:33 +02:00
Jorge Penadés 05f0f72c73 refs #6119 microsip link added
gitea/salix/pipeline/head This commit looks good Details
2023-08-30 14:14:48 +02:00
Javi Gallego 30c863722c fixes #6169 no se necesita tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 14:14:20 +02:00
Javi Gallego fea0db14e2 fixes #6169 invoiceIn con valores predeterminados
gitea/salix/pipeline/head This commit looks good Details
2023-08-30 13:35:51 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Guillermo Bonet d1df8009a6 refs #6023 Fix change rol bug
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-29 10:52:05 +02:00
Juan Ferrer d60e35d817 Merge pull request 'refs #6153 master into test' (!1726) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1726
2023-08-29 06:50:27 +00:00
Jorge Penadés 7f1db050ad Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:56:53 +00:00
Jorge Penadés 5fe12d9281 Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:43:26 +00:00
Jorge Penadés ca28d2d78f ref #5216 myOptions added
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 14:37:32 +02:00
Alex Moreno 2ecc464046 refs #5673 feat(claim_development): redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 14:26:17 +02:00
Alex Moreno 45c58feb8c Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:10:52 +00:00
Vicent Llopis 00b1746fd8 Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 11:32:58 +00:00
Vicent Llopis b304210e8f Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 08:47:12 +00:00
Vicent Llopis c4cf5f3a4f Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 08:04:42 +00:00
Vicent Llopis 9da5c4c1db refs #5918 refacotr: cambiado nombre variable 2023-08-25 10:04:27 +02:00
Javi Gallego 1d300237f2 Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 09:59:18 +02:00
Javi Gallego f54a239229 fixes #6143 fixes: this.bankEntityFk no existe
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 09:46:53 +02:00
Jorge Penadés 083f19fd41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-25 08:11:44 +02:00
Javi Gallego a3d301f12e Merge branch 'dev' into 6143-refactor-iban-con-country 2023-08-25 07:23:08 +02:00
Vicent Llopis f3e43686a3 refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 14:59:28 +02:00
Pablo Natek 147ae85a6e Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2023-08-24 11:44:44 +00:00
Pablo Natek 78eba23d12 refs #6156 new field
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 13:44:15 +02:00
Jorge Penadés 386de69bce refs #5216 fix error handling
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 12:47:10 +02:00
Alex Moreno 4c1d9cd767 hotFix(priceDifference): import UserError
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 11:32:20 +02:00
Jorge Penadés 3d4a99b07e refs 5914 transferInvoice created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 10:51:34 +02:00
Javi Gallego b5b7770f3f refs #6146 fixes: muestra la agencia de la ruta 2023-08-24 10:41:28 +02:00
Jorge Penadés bda3937417 refs #5216 path replaced and test created
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 10:01:07 +02:00
Vicent Llopis 9a12169ba4 Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 07:33:07 +00:00
Vicent Llopis beeebbdf9c refs #6013 refactor: siempre se crea una tranacción para cada dia
gitea/salix/pipeline/head Build queued... Details
2023-08-24 09:33:58 +02:00
Vicent Llopis 1f63648697 refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 09:10:04 +02:00
Jorge Penadés 0f3b633de4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 08:03:01 +02:00
Vicent Llopis f8fd2bbd17 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-08-24 07:50:24 +02:00
Vicent Llopis 3cffdca0c7 Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 05:39:48 +00:00
Vicent Llopis dad792cb76 refs #5244 move changes sql
gitea/salix/pipeline/head Build queued... Details
2023-08-24 07:40:37 +02:00
Alex Moreno 3eacb4dbd9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:05:04 +02:00
Alex Moreno 508a4b2d34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:04:27 +02:00
Alex Moreno 8454d208e1 hotFix(route_tickets): orderBy nickname
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:02:52 +02:00
Jorge Penadés 82d08261e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-23 10:25:48 +02:00
Alex Moreno 7349d4496f refs #5351 hotFix(worker_sip): use worker.id not worker.userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 07:34:01 +02:00
Javi Gallego 4657bf4e43 refs #6143 refactor: ibanValidation with countryCode param
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 14:58:26 +02:00
Alex Moreno 5a5e3ebddb refs #5712 hotFix(catalog): undo last fix search_panel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:57 +02:00
Vicent Llopis dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:09 +02:00
Vicent Llopis c7c17e6e4a Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 11:18:08 +00:00
Vicent Llopis 2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:31:17 +00:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:45:41 +02:00
Alex Moreno a26652045c refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:17:46 +02:00
Guillermo Bonet 6d60592fb9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 09:34:32 +02:00
Guillermo Bonet 86def6e212 refs #5995 Changed query getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 08:47:28 +02:00
Jorge Penadés 040f5be85c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-18 12:18:30 +02:00
Alex Moreno 518d5111e4 refs #6127 hotFix(ticketRefund): get ticketFk front ticketService
gitea/salix/pipeline/head This commit looks good Details
2023-08-17 08:42:04 +02:00
Alex Moreno 868fbbfc2e cau #103812 hotFix(supplier): beforeSave name
gitea/salix/pipeline/head This commit looks good Details
2023-08-16 08:04:32 +02:00
Sergio De la torre 8d0b3efa11 refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:39:40 +02:00
Alex Moreno 1ec51d94cf refs #5134 feat: correct sql
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:53:43 +02:00
Sergio De la torre a6047d257b refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:45:18 +02:00
Alex Moreno 9ef4ba9bef refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:32:49 +02:00
Sergio De la torre 6eb88f8ab7 refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-11 11:58:30 +02:00
Alex Moreno 00fa5b7ce3 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 07:38:53 +00:00
Jorge Penadés 27ab6639c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-10 13:26:42 +02:00
Alex Moreno afc0c98065 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 11:05:37 +02:00
Alex Moreno bdf0138c70 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-08-10 10:40:40 +02:00
Guillermo Bonet b197109556 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 10:14:22 +02:00
Carlos Satorres a11905ee63 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:00:07 +00:00
Carlos Satorres 8807b9f87f fix upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 09:58:48 +02:00
Alex Moreno de773bc849 Merge branch 'master' into 5995-liliumExternalCmr
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 06:55:56 +00:00
Guillermo Bonet d6b30271f2 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:12:52 +02:00
Guillermo Bonet ed88a5b25f refs #5995 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 07:54:49 +02:00
Alex Moreno 209cac2a6a Merge branch 'dev' into 5762-recoverPassword-multiplatform
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:05:16 +00:00
Carlos Satorres 5653a39e3b fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:10:05 +02:00
Carlos Satorres f70b767506 Merge branch 'dev' into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 08:05:46 +00:00
Alex Moreno aee78960b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 08:00:54 +02:00
Alex Moreno 765ab054a1 refs #5934 fix(clientSms): add vn-tooltip
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 07:41:38 +02:00
Jorge Penadés 132640cddf Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-08 15:10:40 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Alex Moreno ce78fc8e5d refs #5986 feat: state model add classColor properties
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 15:06:28 +02:00
Alex Moreno 19c09d60a2 refs #5986 feat(ticket_filter): add classColor column
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 15:04:21 +02:00
Guillermo Bonet 2f64a41f64 refs #5995 Added getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 14:16:47 +02:00
Alex Moreno 0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 07:10:25 +02:00
Alex Moreno 00fcd3a800 refs #6083 feat: add lilium ticketSms
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 14:03:07 +02:00
Alex Moreno e85cddec3c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 10:19:27 +02:00
Alex Moreno 26d6bbff4c refs #5929 hotFix: add UserError
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 10:04:46 +02:00
Alex Moreno 4191d2529d refs #5712 warnFix: getById condition
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 07:57:38 +02:00
Alex Moreno 75d3d12ae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform 2023-08-04 14:31:56 +02:00
Guillermo Bonet eeb68e1ad9 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-04 08:54:41 +00:00
Alex Moreno 700ba4a7b1 refs #5914 feat(transferInvoiceOut): optimization
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-04 08:22:43 +02:00
Carlos Satorres 1308efb98d Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-08-04 01:21:52 +00:00
Alex Moreno 83d0a394e3 refs #5973 refactor(item_fetched-tags): restyle empty tags
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 15:59:09 +02:00
Jorge Penadés 725fe674c0 refs #5914 WIP fixing transacticions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 14:01:50 +02:00
Guillermo Bonet 602f57bca9 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 08:54:32 +00:00
Carlos Satorres 3388fd7c59 fix test back
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 10:26:29 +02:00
Carlos Satorres 4fb0ad415c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head Build queued... Details
2023-08-03 10:03:15 +02:00
Carlos Satorres 183fdacefc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 10:01:11 +02:00
Guillermo Bonet 8deb8c1f54 Merge branch 'master' into 5995-newCmr
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 06:50:04 +00:00
Guillermo Bonet aab0771e6e refs #5995 Removed my code in closure.js
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 14:37:38 +02:00
Alex Moreno fd9b842e6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-08-02 13:58:40 +02:00
Guillermo Bonet 4a0b8f37cd refs #5995 Load blob
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 13:41:44 +02:00
Alex Moreno 56cd94feaa refs #5843 fix(timeControl_filter): not use userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 13:26:42 +02:00
Guillermo Bonet 16353dfddc refs #5995 First commit
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 07:35:40 +02:00
Jorge Penadés bd122e6327 refs #5014 WIP trasactions added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-01 16:13:24 +02:00
Alex Moreno b8780dfbbf Merge branch 'master' into hotifx-loadDataDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 12:12:17 +00:00
Carlos Satorres 2bde94a667 Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 11:40:29 +00:00
Jorge Penadés fc32f48b64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-01 12:46:15 +02:00
Jorge Penadés 3ef74cab5c refs #5914 WIP created transferInvoiceOut 2023-08-01 12:45:57 +02:00
Carlos Satorres 79d88facc3 refs #4764 add test front
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 12:33:56 +02:00
Alex Moreno 30c5e8d8cc hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 11:11:29 +02:00
Carlos Satorres 40607a42cf hotfix-loadData
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 10:25:44 +02:00
Carlos Satorres 12acda0b1c refs #4764 ticketSerivce refund add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 11:06:19 +02:00
Vicent Llopis db992a9b91 Merge branch 'dev' into hotfix_workCenter_isNull
gitea/salix/pipeline/head This commit looks good Details
2023-07-31 08:54:37 +00:00
Jorge Penadés 22f76ec6a9 refs #5914 WIP clone method created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 10:33:51 +02:00
Jorge Penadés e63efa4f0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-31 10:32:41 +02:00
Vicent Llopis 7d10be37ec Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 08:26:30 +00:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 15:21:43 +02:00
Carlos Andrés 6872cea6bf Merge branch 'master' into 6077-Log-InvoiceInDueday-incorrecto-Salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 13:13:59 +00:00
Vicent Llopis 81dc163819 ya no muestra error en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-28 14:40:03 +02:00
Alex Moreno e253dd7982 refs #5351 fix(worker_model): remove required userFk
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 14:39:01 +02:00
Carlos Andrés 136b401ede refs #6077 espacios correctos
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 14:17:50 +02:00
Carlos Andrés 4061f3e5ce #refs 6077 espacios por tabulaciones
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 12:28:41 +02:00
Vicent Llopis 1d4ce2c703 refs #5804 fix: delete transaction
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 12:24:24 +02:00
Vicent Llopis 251ed36eca refs #6013 feat: mostrar error en el mail
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 10:51:48 +02:00
Carlos Satorres af60412232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-07-27 17:24:50 +02:00
Carlos Satorres d01584bfb3 refs #4764 service
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 15:15:55 +02:00
Vicent Llopis 0054f2d82f refs #6013 fix: codigo no bloqueante
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 15:07:10 +02:00
Vicent Llopis 7367d1cdfe refs #6013 fix: add await
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 14:41:53 +02:00
Carlos Andrés 3bc3ffe115 refs #6077 Log-InvoiceInDueday-incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 13:40:39 +02:00
Vicent Llopis 65b9cadd9e refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 12:51:14 +02:00
Vicent Llopis 777426aa05 refs #5561 add backTest
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:58:55 +02:00
Alex Moreno 305caaf8aa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-07-27 07:20:34 +02:00
Alex Moreno 61b17d1fa5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:19:48 +02:00
Jorge Penadés 10361ba78e refs #5216 addExpeditionState refactored
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:33:56 +02:00
Carlos Satorres 118f41c898 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:12:01 +02:00
Jorge Penadés bbc26d8ba4 WIP refs #5216 addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 12:36:30 +02:00
Jorge Penadés 0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:27:01 +02:00
Jorge Penadés 05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:22:32 +02:00
Jorge Penadés a0fee6ad50 refs #5929 removed useless vars
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 09:20:54 +02:00
Jorge Penadés 0b6fb70f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice 2023-07-26 08:36:29 +02:00
Alex Moreno af28cfe6df Merge branch 'dev' into 6047-addEditableTd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 05:22:44 +00:00
Jorge Penadés fa9dfdf411 refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 16:32:38 +02:00
Jorge Penadés 96483a827f Merge branch 'dev' into 5929-editTicketPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 13:40:08 +00:00
Jorge Penadés 543fbf3c0a refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 15:35:08 +02:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 11:33:01 +02:00
Alex Moreno 44ceeac9c4 refs #5983 feat(itemShelving): add userFk field
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 10:21:54 +02:00
Jorge Penadés ea4190f15c refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good Details
2023-07-24 13:32:28 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-24 10:34:44 +02:00
Jorge Penadés 55f32397c5 removed unnecesary comments
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:13:44 +02:00
Jorge Penadés ade7303a6f refs #6047 added editable-td component
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:05:55 +02:00
Vicent Llopis 8267daef3a refs #5918 fix: permite reenviar el correo si ha dado fallo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:58:44 +02:00
Alex Moreno 23308d7ae3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-21 12:40:59 +02:00
Alex Moreno 985e258529 refs #5769 fix(web-access): email rule
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:33:14 +02:00
Vicent Llopis 9bf891fcec refs #5561 fixed
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:20:06 +02:00
Vicent Llopis f926c60017 remove file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:02:02 +02:00
Vicent Llopis 51f9055d23 remove file 2023-07-21 12:01:57 +02:00
Vicent Llopis cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:01:01 +02:00
Vicent Llopis f52b398596 refs #5561 refactor: sustituidos sql por loopback
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 09:50:27 +02:00
Alex Moreno eb963ff993 refs #5866 fix(transferClient): correct variable name
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 08:28:19 +02:00
Jorge Penadés 618989052a refs #5866 fix transferClient and test added
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:15:33 +02:00
Vicent Llopis 7d2e98267f refs #5561 eliminados valores a piñon
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:09:31 +02:00
Jorge Penadés 8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 12:34:16 +00:00
Vicent Llopis 8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 11:42:10 +02:00
Jorge Penadés 2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:23:07 +00:00
Jorge Penadés 9db8ae237f refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 10:19:03 +02:00
Vicent Llopis 1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:15:57 +00:00
Vicent Llopis 7312ed9cc4 refs #5244 fix back test
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 09:56:07 +02:00
Vicent Llopis d6a27741b5 a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 09:50:56 +02:00
Vicent Llopis 04ca5743a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 09:40:41 +02:00
Alex Moreno 5771ccb488 Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:50:56 +00:00
Alex Moreno aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:40:23 +00:00
Alex Moreno 60e75d7825 refs #5837 fix client condition
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:23:43 +02:00
Vicent Llopis 4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:22:30 +02:00
Vicent Llopis 6df1ef9d4c Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head Build queued... Details
2023-07-20 05:16:54 +00:00
Vicent Llopis ab95ef74a9 refs #5934 refactor: nombres variables
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:17:35 +02:00
Alex Moreno 8c84f006b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 07:15:30 +02:00
Carlos Satorres 6efda27f0c Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 04:06:29 +00:00
Sergio De la torre 6344c11d1e Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 14:29:18 +00:00
Alex Moreno 2c79056f34 refs #5976 error extended
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 13:44:04 +02:00
Carlos Satorres 579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 10:46:17 +00:00
Carlos Satorres 36c31af455 refs #5690 rounding translate
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 12:38:13 +02:00
Carlos Satorres aaba4e74b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems 2023-07-19 12:00:59 +02:00
Sergio De la torre e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 05:02:39 +00:00
Carlos Satorres 25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 04:36:51 +00:00
Carlos Satorres 36db2ee883 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:05:56 +00:00
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Sergio De la torre 49c656928e refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:43:11 +02:00
Carlos Satorres bd723bb7ba refs #5824 mod ng
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:58 +02:00
Alex Moreno f07ac89cb6 refs #5976 add custom error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:04 +02:00
Vicent Llopis d3165fcdc7 refs #5849 fix: tback
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:25:53 +02:00
Vicent Llopis 7bd378e9dd refs #
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 14:15:56 +02:00
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis 3e8775149a refs #5934 feat: change icon
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:02:42 +02:00
Vicent Llopis b3a7a170f0 refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 11:54:43 +02:00
Sergio De la torre 93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 08:54:45 +02:00
Carlos Satorres 47e8fab8d9 refs remove
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 19:51:46 +02:00
Alex Moreno 15dee8bef4 refs #5976 refactor: transaferSale call setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 15:19:36 +02:00
Alex Moreno d2120cdc3d refs #5762 feat: multiplatform recover-password and change-password
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:24:50 +02:00
Carlos Satorres 52f58a92c8 refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:11:05 +02:00
Carlos Satorres a5d1c68511 change err and traduction
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:07:45 +02:00
Carlos Satorres 10e726c486 move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 13:51:16 +02:00
Sergio De la torre 639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 13:50:07 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Carlos Satorres b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:49:26 +00:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Carlos Satorres 87f125453d refs #5640 fix mayus quit function 2023-07-14 13:35:13 +02:00
Carlos Satorres fa3745820d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate 2023-07-14 13:20:19 +02:00
Vicent Llopis 6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:11:09 +02:00
Carlos Satorres 93387cae62 refs #5837 if isSocialNameUnique
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:07:40 +02:00
Vicent Llopis 28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:04:06 +00:00
Vicent Llopis 5716acaa3c fix: test
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:01:31 +02:00
Vicent Llopis 4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 12:18:41 +02:00
Vicent Llopis 4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:51:15 +02:00
Carlos Satorres 765c22df96 refs #5837 new table
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:30:13 +02:00
Carlos Satorres 6d8b3e346d refs #5837 fix filter existingClient France
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 09:40:16 +02:00
Carlos Satorres 190db79019 Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 07:34:27 +00:00
Alex Moreno 29a4c51518 Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 05:34:18 +00:00
Guillermo Bonet 765a84e2eb refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 07:27:04 +02:00
Carlos Satorres 173ed251c3 refs #5964 fix supply
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 13:45:07 +02:00
Alex Moreno 4632ed298d Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 11:41:40 +00:00
Vicent Llopis 75a66571ba refs #5244 refactor: modificados todos los url='activeWith...'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 12:59:39 +02:00
Vicent Llopis c876719a5c refs #5244 fix: corregidos errores 2023-07-13 12:59:02 +02:00
Vicent Llopis 1d7f0e2135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 11:42:49 +02:00
Carlos Satorres 191f478523 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:58:09 +02:00
Carlos Satorres 2627cafc22 refs #5999 defaulter country autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:54:22 +02:00
Carlos Satorres 660612cb84 refs #5999 url
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:22:41 +02:00
Vicent Llopis 392dc5060a refs #4770 delete test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 10:19:12 +02:00
Vicent Llopis 01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:42:53 +02:00
Alex Moreno ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:43:50 +02:00
Vicent Llopis 337ce56a60 refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:37:11 +02:00
Alex Moreno 978224c21c Merge branch 'master' into hotfix_mailAlias
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 06:14:53 +00:00
Alex Moreno e994e54e4b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 07:11:09 +02:00
Carlos Satorres 7da1824e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 06:39:05 +02:00
Vicent Llopis 7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 15:07:06 +02:00
Vicent Llopis ef6a2ae578 refs #5887 fix: delete requires
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 14:06:28 +02:00
Vicent Llopis c0d329edca a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 14:04:17 +02:00
Alex Moreno 78108b2ca5 Merge branch 'master' into hotfix-travel
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 12:01:26 +00:00
Vicent Llopis 551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir
gitea/salix/pipeline/head Build queued... Details
2023-07-12 13:55:57 +02:00
Vicent Llopis 954c2f5435 refs #5244 feat: carga valor inicial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:12:51 +02:00
Alex Moreno 219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:09:58 +02:00
Carlos Satorres 510b78c703 refs #6006 mod dias anteriores
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:08:46 +02:00
Alex Moreno 9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:05:17 +02:00
Alex Moreno d7ac20dc6a hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:02:27 +02:00
Vicent Llopis bd85cf4e90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 12:29:17 +02:00
Vicent Llopis a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 11:50:15 +00:00
Vicent Llopis 6655807d80 refs #4770 refactor: change acl
gitea/salix/pipeline/head Build queued... Details
2023-07-11 13:50:38 +02:00
Vicent Llopis 5a5a1ed20b refs #5887 feat: addback test
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 13:22:54 +02:00
Vicent Llopis e1f12bea02 a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 12:33:44 +02:00
Vicent Llopis da13f0811c refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 09:59:11 +02:00
Vicent Llopis 93e70e699a refs #5874 feat: refactorizado proceso facturación 2023-07-11 09:19:15 +02:00
Carlos Satorres 7291b793ae refs #5949 fix traduct
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 08:41:43 +02:00
Carlos Satorres ba109dccc5 refs #5949 trad
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 07:58:18 +02:00
Carlos Satorres d1c8f0ff11 refs #5949 itemRecycle
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 07:37:51 +02:00
Alex Moreno 5e6d941f36 Merge branch 'dev' into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 06:53:11 +00:00
Alex Moreno d941e2e18f Merge branch 'master' into hotfix-extraCommunityEntryRef
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 05:26:05 +00:00
Carlos Satorres 9f2ef5c2c0 change ref master
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 07:22:23 +02:00
Alex Moreno 8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-07 12:25:02 +02:00
Alex Moreno d9a5868ce4 refs #5930 fix(claim_updateClaim) options
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 10:55:45 +02:00
Vicent Llopis 7030be3efa fix
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 09:30:04 +02:00
Alex Moreno 8fe9b387ce refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 15:16:52 +02:00
Alex Moreno be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-06 15:15:36 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 10:42:53 +02:00
Carlos Satorres 9c9b53917a refs #5334 fix error
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 08:20:33 +02:00
Carlos Satorres 3d9f0e1497 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-07-06 05:48:45 +02:00
Alex Moreno 6530e87508 refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 15:20:51 +02:00
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:50:45 +02:00
Alex Moreno d7fca07446 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 10:17:42 +00:00
Alex Moreno 5d933da28a refs #5712 fix empty data
gitea/salix/pipeline/head Build queued... Details
2023-07-05 12:14:26 +02:00
Alex Moreno 444b08c566 refs #5712 test(docuware)
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:09:52 +02:00
Carlos Satorres f42273006c refs #4764 service ant
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 07:36:01 +02:00
Alex Moreno 1a18ba66a9 refs #5712 fix(workerDms): filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-04 15:18:57 +02:00
Vicent Llopis 4369d275f8 refs #4770 feat: add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-04 15:04:32 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Carlos Satorres 3b81198a05 refs #4764 mod button
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 13:57:52 +02:00
Carlos Satorres 6b813cb859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 11:54:19 +02:00
Carlos Satorres 5000e05e05 refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 09:57:16 +02:00
Carlos Satorres f1502139ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-07-04 09:56:38 +02:00
Alex Moreno 4f616397a2 refs #5712 use dmsType readRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 15:05:39 +02:00
Carlos Satorres 983d028d06 refs #5334 popover y basic data
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:58:40 +02:00
Alex Moreno c7b9d0827e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 13:42:54 +02:00
Pablo Natek 8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 11:35:50 +00:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:51:48 +00:00
Carlos Satorres 4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head Build queued... Details
2023-07-03 09:47:43 +00:00
Carlos Satorres c3ef642017 refs #5836 fix fk
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 11:45:05 +02:00
Carlos Satorres d03df4c5cc refs #5690 ticketproblems
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 11:38:38 +02:00
Carlos Satorres 5e68363312 refs #5334 onsearch postlink
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:38:36 +02:00
Alex Moreno d1fb2859be Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 06:59:42 +00:00
Carlos Satorres dc10c20fe3 refs #5334 email validate
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 07:29:58 +02:00
Carlos Satorres dc36c6fd9d refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 13:52:46 +02:00
Vicent Llopis 7b4e8570aa refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-30 12:03:26 +02:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 11:57:56 +02:00
Carlos Satorres e6ed834bf0 refs #5836 remove case
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 10:07:29 +02:00
Carlos Satorres 3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 09:40:15 +02:00
Carlos Satorres 83b096c206 refs #5334 fix errors 2023-06-30 09:40:12 +02:00
Carlos Satorres 6b4501146d refs #5334 fix errors 2023-06-30 09:39:48 +02:00
Alex Moreno 6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 08:26:51 +02:00
Alex Moreno ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump 2023-06-30 08:23:00 +02:00
Alex Moreno 5f42ee5f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 07:55:47 +02:00
Vicent Llopis f3e771747a refs #5244 fix: getItemTypeWorker permite filtrar por id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:56:07 +02:00
Vicent Llopis 3cedef6f16 refs #5244 fix: add id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:22:53 +02:00
Alex Moreno b062cec747 refs #5475 fix setPassword options/cb
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:01:24 +02:00
Alex Moreno c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 14:50:06 +02:00
Javi Gallego bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:43:16 +00:00
Carlos Satorres af91630852 refs #5836 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 13:22:51 +02:00
Vicent Llopis 011db142d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 12:49:55 +02:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Carlos Satorres bb4951bbc8 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:47:41 +00:00
Carlos Satorres 9dc52b6011 refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 09:44:21 +02:00
Carlos Satorres 454cf30de7 refs #4764 boton save
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 08:27:20 +02:00
Pablo Natek bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 05:22:06 +00:00
Carlos Satorres 319c6af354 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-29 06:37:23 +02:00
Vicent Llopis c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 12:41:26 +00:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +02:00
Alex Moreno befa385830 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:30:20 +02:00
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Vicent Llopis 3128601027 Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:47:39 +00:00
Vicent Llopis 6894da7e22 refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 13:27:18 +02:00
Alex Moreno da50ea1dd0 Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:10:51 +00:00
Carlos Satorres f02019d64d refs #5334 fix words
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:52:53 +02:00
Alex Moreno 89c25c07b6 refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 09:59:55 +02:00
Alex Moreno 9b0cf7f378 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-28 07:20:12 +02:00
Alex Moreno 31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 07:19:04 +02:00
Alex Moreno 162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-28 07:18:10 +02:00
Alex Moreno 4b8b7a9d82 refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 15:30:54 +02:00
Alex Moreno f8a972c2f2 refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 14:48:22 +02:00
Carlos Satorres 07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-27 13:36:51 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00
Carlos Satorres 7e542f93a1 Merge branch 'test' into warnFix_travel_summary_entry
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 10:11:59 +00:00
Carlos Satorres 8e5a6dbab3 fix warn
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 11:44:23 +02:00
Vicent Llopis 87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:33:15 +02:00
Carlos Satorres 5216f12001 refs #5836 check fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:27:39 +02:00
Carlos Satorres 549235429c refs #5640 oldBranch
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 07:18:36 +02:00
Carlos Satorres 24ea18aeb0 refs #5836 isworker back
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 13:55:39 +02:00
Alex Moreno 15c45bb544 Merge branch 'test' into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:30:57 +00:00
Alex Moreno 224a44847d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:56:07 +02:00
Alex Moreno ecf742959c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:55:28 +02:00
Carlos Satorres 88e845b511 change applyFilters
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:49:09 +02:00
Guillermo Bonet e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:06:41 +02:00
Guillermo Bonet cc5021a75f refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 09:40:55 +02:00
Alex Moreno 798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-26 07:53:44 +02:00
Carlos Satorres eff46c1cec refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 07:43:36 +02:00
Carlos Satorres dcbe8c5f7a refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 06:28:35 +02:00
Carlos Satorres abfe012a78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-26 06:12:22 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:08:13 +02:00
Juan Ferrer f70df714df refs #5772, #5900 InvoiceOut back test removed, logs improved 2023-06-25 16:31:24 +02:00
Juan Ferrer 7660d76850 refs #5772 Test environment fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 22:52:03 +02:00
Juan Ferrer 665339c8d2 refs #5772 Fix for unhandled ENOENT error
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 22:02:33 +02:00
Juan Ferrer 2fec5bf2aa Merge pull request 'refs #5772 test into dev' (!1633) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1633
2023-06-23 09:51:44 +00:00
Juan Ferrer 8c0e8e9e12 refs #5772 Fixes fetching parallelism from front
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:50:40 +02:00
Juan Ferrer 47a4a9950f refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:42:30 +02:00
Pablo Natek 16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 16:02:30 +00:00
Carlos Satorres beb173f6ce refs #5334 quit e2e no necesario
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 15:20:28 +02:00
Vicent Llopis d9b1f4b8a1 refs #5688 fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:06:27 +02:00
Carlos Satorres 137e01e60c refs #5334 fix acl, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:00:59 +02:00
Vicent Llopis d272121258 refs 5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 14:52:42 +02:00
Carlos Satorres 757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 12:46:36 +00:00
Carlos Satorres 4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-22 14:42:28 +02:00
Vicent Llopis 389b53ceff refs #5772 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 13:37:43 +02:00
Vicent Llopis d26778e94e refs #5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:30:53 +02:00
Carlos Andrés 12aa9c6b4b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:23:03 +02:00
Vicent Llopis 591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 12:48:50 +02:00
Carlos Satorres 7f9d8da7a7 refs #5836 defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:42:21 +02:00
Vicent Llopis 9d1a181b73 refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:10:56 +02:00
Vicent Llopis d8fe284bcd Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 07:53:11 +00:00
Vicent Llopis 5f4b62f133 refs #5688 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 09:48:14 +02:00
Alex Moreno 18a8106461 refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:56:27 +02:00
Carlos Andrés 807596f735 refs #5772
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:50:18 +02:00
Vicent Llopis 473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 08:04:17 +02:00
Carlos Andrés 10a25ff590 refs #5772
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 07:49:35 +02:00
Alex Moreno aea32492e3 Merge branch 'master' into 5339_instance_vs_data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 05:33:34 +00:00
Vicent Llopis e9ef81f8d7 refs #5244 feat: coge todos los hijos recursivamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 15:00:46 +02:00
Alex Moreno 6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Vicent Llopis a699e2d874 refs #5244 feat: añadido 'depatments' como binding
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:07:36 +02:00
Carlos Satorres 9870cc7b14 refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:34:27 +02:00
Vicent Llopis dd75302bbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:33:09 +02:00
Carlos Satorres 168d05a830 refs #5334 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:07:04 +02:00
Juan Ferrer dfdd3a1733 Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 11:08:29 +02:00
Juan Ferrer 44192c0606 refs #5667 Client translations added 2023-06-21 11:08:28 +02:00
Carlos Andrés 6f9fd9bb72 refs #5772 mensajes de error
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 09:40:14 +02:00
Alex Moreno 38de19f044 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:44:13 +00:00
Alex Moreno 2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:24:19 +00:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Pablo Natek e741904250 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 17:01:06 +02:00
Vicent Llopis f37974c835 Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:39:27 +00:00
Carlos Satorres fa10070675 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 14:04:38 +02:00
Vicent Llopis e99627c0b2 codigo innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 11:28:25 +02:00
Vicent Llopis cea6fae649 fix: eliminada variable que no estaba definida
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 10:40:57 +02:00
Vicent Llopis 6c00e704cc refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:42:08 +02:00
Carlos Satorres f0f8b112cd Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 07:22:52 +00:00
Alex Moreno 5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:20:54 +02:00
Alex Moreno dcfb991f94 hotFix(getLeaves): remoteMethodCtx correct defined
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:20:06 +02:00
Carlos Satorres c63df30e5c refs #5334 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:19:20 +02:00
Carlos Satorres a155f846c2 refs #5334 fix ctx
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:15:37 +02:00
Carlos Satorres 4537344790 merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 08:20:13 +02:00
Carlos Satorres 7f20973650 refs #5334 merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 08:16:36 +02:00
Vicent Llopis 8a2cab0e62 Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 05:30:55 +00:00
Alex Moreno 092471f74e refs #5475 feat(account_changePassword): accessScope and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-19 15:06:06 +02:00
Juan Ferrer 9fa6e2df71 refs #5595 VnModel.rawSql() bugfix
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 14:54:32 +02:00
Alex Moreno 63888e2d64 refs #5595 console.log(orderFk, userId) for rawSQL logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 13:52:25 +02:00
Carlos Satorres 3701acd26e refs #5334 error getLeaves solve
gitea/salix/pipeline/head Build queued... Details
2023-06-19 13:48:14 +02:00
Carlos Satorres 98125f8974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-19 13:22:41 +02:00
Sergio De la torre b6c8ca20ee refs #5339 data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-19 08:58:20 +02:00
Carlos Satorres 8dd360bf1e refs #4764 e2e solve
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 08:46:15 +02:00
Alex Moreno 2197441159 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 07:20:00 +02:00
Alex Moreno ee1b901dea refs #5475 feat(account_changePassword): accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 14:31:14 +02:00
Alex Moreno dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 13:42:13 +02:00
Juan Ferrer 081cf43ece refs #5667 SupplierAccount translation added 2023-06-16 13:39:24 +02:00
Alexandre Riera 9c18391c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded 2023-06-16 13:21:11 +02:00
Vicent Llopis 55e123e795 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 11:45:08 +02:00
Alex Moreno cf01c8d46e refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 09:35:20 +02:00
Carlos Satorres 0eca606de0 Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 07:29:30 +00:00
Carlos Satorres fbe4441eda refs #4764 e2e solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 09:06:25 +02:00
Alex Moreno 50fe53fbb6 Merge branch 'test' into warnFix_ticket_sale_orderBy
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 05:38:14 +00:00
Carlos Satorres 9b950cd8d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-16 07:23:41 +02:00
Alexandre Riera 73133778fc Merge branch 'dev' into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 05:07:16 +00:00
Carlos Satorres 7bff915a7f refs #5325 back fix correct
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 17:14:34 +02:00
Carlos Satorres 4157e30d4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-15 16:47:33 +02:00
Alex Moreno b96f0f22b5 refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 15:16:51 +02:00
Alex Moreno 5163b7b253 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-15 15:14:41 +02:00
Vicent Llopis 55990869e2 refs #5688 ya no muestra mensaje de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 14:16:26 +02:00
Vicent Llopis b7b6f413ba refs #5688 feat: no mostrar datos si no tiene workerCenterFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 14:15:22 +02:00
Vicent Llopis 192f4c7864 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter 2023-06-15 14:15:00 +02:00
Juan Ferrer 1c666cd48e refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 13:10:44 +02:00
Carlos Satorres 8b832c68b3 refs #5325 fix back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 12:49:53 +02:00
Alex Moreno 71651b96a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 11:49:40 +02:00
Alex Moreno 99ad9d3afa refs #5753 fix(change-password) 2023-06-15 11:49:39 +02:00
Vicent Llopis 5f2c5c5f9d refs #5842 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 09:55:32 +02:00
Vicent Llopis a50de4e509 refs #5842 feat: comprueba que invoiceDate no sea null
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 09:50:46 +02:00
Alex Moreno a206f64e3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-06-15 07:27:04 +02:00
Vicent Llopis 14ebcf96c0 refs #5842 refactor: change names
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:24:17 +02:00
Sergio De la torre 1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:22:10 +02:00
Carlos Satorres b3022d0ce2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 17:47:56 +02:00
Carlos Satorres 9cdc914a25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-14 17:03:09 +02:00
Alex Moreno 3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 15:15:00 +02:00
Vicent Llopis 7fa4eabf86 refs #5842 fix: recalcula invoiceDate cuando se cambia la company
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 14:59:18 +02:00
Sergio De la torre e8b98a2daf Merge branch 'dev' into 5651-packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 11:18:24 +00:00
Vicent Llopis 98b270b885 refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 13:05:46 +02:00
Vicent Llopis 9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:57:58 +00:00
Vicent Llopis 65108943ab refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:48:14 +02:00
Vicent Llopis e62a3ce166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:39:16 +02:00
Sergio De la torre c62e6fa0eb refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:51:22 +02:00
Juan Ferrer 961941ecb3 refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 20:52:26 +02:00
Carlos Satorres 66c5eda6f2 refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 16:08:11 +02:00
Alex Moreno aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-13 11:49:42 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 11:37:35 +02:00
Vicent Llopis 72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 10:26:12 +02:00
Vicent Llopis fa9719de78 refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 08:16:37 +02:00
Vicent Llopis 0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:35:29 +02:00
Vicent Llopis 6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:34:41 +02:00
Alex Moreno a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware 2023-06-13 07:11:39 +02:00
Juan Ferrer cc788d7e06 refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:28:47 +02:00
Juan Ferrer 3386af9b17 refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:27:02 +02:00
Carlos Satorres 59642ab3ca refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 15:44:22 +02:00
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 15:20:46 +02:00
Carlos Satorres 908799adee refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 14:58:28 +02:00
Carlos Satorres c9c9b64884 refs #5660 deliveryAssit 2023-06-12 14:57:41 +02:00
Alex Moreno f113bfbc95 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 12:32:29 +00:00
Carlos Satorres 58bcad7b2d refs #4764 validator create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 12:42:30 +02:00
Alex Moreno 24b3697ac6 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:31:25 +00:00
Carlos Satorres c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:56:34 +00:00
Alex Moreno 1c39ad873c resolve dev conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 11:06:45 +02:00
Alex Moreno 22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-12 11:06:27 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:46:21 +02:00
Alexandre Riera f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:27:18 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:26:50 +02:00
Alex Moreno 051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:11:17 +02:00
Alex Moreno 2c0c0f24b0 reactive
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 08:36:19 +02:00
Alex Moreno 1a58424531 refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 08:33:31 +02:00
Alexandre Riera 48ee29568d Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 05:26:28 +00:00
Alex Moreno d735f142a1 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 05:04:28 +00:00
Carlos Satorres 06d1334e1f refs #4764 withWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-09 14:30:46 +02:00
Carlos Satorres 9ca82a2f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-09 14:23:55 +02:00
Carlos Satorres 61d9e2dcd3 refs #4764 remake refund, back front
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 14:19:17 +02:00
Carlos Satorres 9b4c4496b6 Merge branch 'dev' into 5760-changesSMS
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 11:16:02 +00:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 09:03:23 +02:00
Carlos Satorres ec9dfa90fd refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 08:06:45 +02:00
Pablo Natek ac67a2606f Merge branch 'dev' into 5735-creditFormat
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 07:11:13 +02:00
Carlos Satorres bdffc0401f refs #5760 update getChanges, traduccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 15:29:03 +02:00
Alex Moreno 96d88cdf4b refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 14:42:07 +02:00
Vicent Llopis f47a049d7a refs #5244 fix: cambiada descripción erronea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 13:39:21 +02:00
Vicent Llopis 653c37f048 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-06-08 13:12:59 +02:00
Vicent Llopis 7dd5a5ac8e refs #5244 feat: hereda correctamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 13:12:30 +02:00
Carlos Satorres 7ea7816800 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:49:28 +02:00
Juan Ferrer 32a0955c1d refs #5667 Zone translations fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:48:14 +02:00
Alex Moreno 3e39564695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:39:36 +02:00
Vicent Llopis 1e759119db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-08 11:13:07 +02:00
Vicent Llopis 874255f2e5 refs #5244 feat: extiende correctamente
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 11:07:57 +02:00
Carlos Satorres 0afc26e20c refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 10:30:03 +02:00
Alex Moreno 5ba8a15316 refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 10:25:25 +02:00
Vicent Llopis cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 09:19:57 +02:00
Vicent Llopis a88166cdb5 Merge branch 'dev' into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 05:15:24 +00:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 23:54:27 +02:00
Juan Ferrer 980ea67c24 Merge pull request 'test' (!1596) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1596
2023-06-07 21:02:22 +00:00
Vicent Llopis 0dbd3abd65 refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 15:06:37 +02:00
Vicent Llopis e2c7a38e82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 14:18:36 +02:00
Carlos Satorres a34519f6d0 refs #4764 refundTicket
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 14:12:04 +02:00
Alex Moreno e5ababb0a9 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 11:49:40 +00:00
Alex Moreno 1240a6b71a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 11:44:47 +00:00
Alex Moreno edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 13:34:13 +02:00
Carlos Satorres 4e08f51848 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:16:13 +00:00
Alexandre Riera 7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 08:50:53 +02:00
Alex Moreno abf454496d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-07 08:34:55 +02:00
Alexandre Riera bfd421c188 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 06:30:43 +00:00
Carlos Satorres cc27d1fa97 refs #5066 fix vehicle res.data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 08:30:37 +02:00
Carlos Satorres 738b04af4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-07 08:15:50 +02:00
Carlos Satorres d09075d490 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 05:57:05 +00:00
Vicent Llopis 3805812aba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:43:44 +02:00
Alexandre Riera 16ad082967 back fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:36:30 +02:00
Alex Moreno ac0e7ae32b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 07:08:02 +02:00
Alex Moreno cb50c617ee refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 15:09:01 +02:00
Vicent Llopis 391dba6d2c refs #5561 feat: add async functions
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 12:15:39 +02:00
Vicent Llopis 024cb1e3f4 refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:56:14 +02:00
Carlos Satorres 05111c9268 hotfix test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:43:14 +02:00
Carlos Satorres 6f3704c365 hotfix colors ticket advance ticket future 2023-06-06 11:42:35 +02:00
Alexandre Riera daf85368a0 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 08:40:07 +00:00
Alexandre Riera 6e4d7e8b01 refs #5749 added id
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 10:31:08 +02:00
Alexandre Riera 36b0216640 refs #5513 changed tests description
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 07:40:38 +02:00
Alexandre Riera 9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 12:25:50 +00:00
Carlos Satorres 4d333c3a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 10:38:59 +02:00
Vicent Llopis 5eac9d20dc a
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:43:39 +02:00
Vicent Llopis b253ea8edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:40:23 +02:00
Alexandre Riera 15b5f10a93 refs #5513 addFromBuy back added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 09:10:19 +02:00
Juan Ferrer fe32a2af05 refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:35:07 +02:00
Carlos Satorres d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-05 08:30:12 +02:00
Carlos Satorres c1cda1a3ff refs #5334 basicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:29:56 +02:00
Alex Moreno 91b0e3013a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:11:47 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Juan Ferrer 47c6ad6a71 refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:48:27 +02:00
Juan Ferrer 45eba4533a refs #5667 VnUser translation added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:47:45 +02:00
Juan Ferrer 5be79bbdef refs #5667 VnUser translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:31:36 +02:00
Alex Moreno 86cd5f5237 refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-02 15:07:02 +02:00
Carlos Satorres 1095a59954 refs #5334 rest back, e2e summary, less e2e basic
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 14:44:56 +02:00
Vicent Llopis 67413360c6 refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 13:31:41 +02:00
Vicent Llopis 01175a4c6c quitado vn
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:32:34 +02:00
Vicent Llopis 186ec2ea41 fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:22:27 +02:00
Vicent Llopis ba64dbbe46 refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:20:29 +02:00
Juan Ferrer c05d6bb9a1 refs #5563 WorkerDocument translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 11:43:44 +02:00
Vicent Llopis 02d2afcb8b refs #5561 feat: permite coloear todos los circulos
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 10:57:28 +02:00
Alexandre Riera 37bbc66ca4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 09:39:46 +02:00
Juan Ferrer 95715763a1 refs #5667 Worker translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:57:22 +02:00
Vicent Llopis cf2bf0a17b refs #5561 delete: codigo obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:23:44 +02:00
Carlos Satorres 5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-02 08:21:14 +02:00
Carlos Satorres 04780e211d refs #5334 test front & 1/2 back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 16:03:55 +02:00
Vicent Llopis d727ea83ab refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:31:16 +02:00
Alex Moreno 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:29:46 +02:00
Vicent Llopis 0d85069e0f refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 15:01:38 +02:00
Carlos Satorres bb5247c49b refs #5334 tree
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:50 +02:00
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:23 +02:00
Alex Moreno 69bf26433d fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 13:19:34 +02:00
Carlos Satorres f37c66304f refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 12:00:15 +02:00
Carlos Satorres 4c7c7f5c96 refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 11:30:28 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Carlos Satorres 0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:52:21 +02:00
Vicent Llopis d5aae8f824 refs #5688 refactor: muestra un mensaje de error controlado
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:53:31 +02:00
Carlos Satorres 967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:46:19 +02:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:10:25 +02:00
Vicent Llopis 3b4626ee74 a
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:01:16 +02:00
Carlos Satorres eb6953a2b6 refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:50:02 +02:00
Vicent Llopis 02665ec8e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-05-31 12:28:13 +02:00
Carlos Satorres d1a61b3e0d refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:26:49 +02:00
Carlos Satorres 489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-31 12:04:26 +02:00
Carlos Satorres e38bf4f1b3 refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:02:22 +02:00
Alex Moreno 9ebac5a3f8 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 09:40:32 +00:00
Alex Moreno f0024346a8 refs #5712 openDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 11:32:37 +02:00
Carlos Satorres 0774a94d8b refs #5334 params
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 11:24:11 +02:00
Carlos Satorres d18137bce0 refs #5066 not dense
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:20:13 +02:00
Vicent Llopis a539abf3d8 refs #5244 feat: creado back para buscar trabjadores por name. nickname y code
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:15:16 +02:00
Carlos Satorres cfe0ba7a77 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:04:36 +02:00
Carlos Satorres dfebb3b307 refs #5066 sorted without CONCAT, order=false 2023-05-31 10:04:34 +02:00
Alexandre Riera eeadd72cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 09:53:56 +02:00
Alex Moreno 6d23ef5d1e Merge branch 'master' into 5153---business-type-worker-descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 05:04:57 +00:00
Juan Ferrer a4d7988591 refs #5517 Translations fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 19:39:11 +02:00
Carlos Satorres d6c588d7eb Merge branch 'dev' into 5398-fixErrorWarehouses
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:02:54 +00:00
Carlos Satorres 2c3869d961 refs #5398 capital letters
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:48:09 +02:00
Carlos Satorres 0fd7f4183e refs #5334 fk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:36:39 +02:00
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 15:34:11 +02:00
Vicent Llopis daeed312d0 refs #5244 fix: añadido vn-drop-down em html
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:16:15 +02:00
Carlos Satorres 1dcaba1fdc refs #5334 department workers list
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:13:16 +02:00
Vicent Llopis 6cf1e0953d refs #5244 feat: intento de crear el componente workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:49:28 +02:00
Carlos Satorres 26187898e1 refs #5334 popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:02:34 +02:00
Alexandre Riera 576a5f050e refs #5513 fix back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 13:48:56 +02:00
Alexandre Riera c0c522c619 Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 13:47:11 +02:00
Alexandre Riera 1fd51c191f refs #5513 minor fixes 2023-05-30 13:47:09 +02:00
Carlos Satorres 8860c77147 refs #5334 fix descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 13:21:57 +02:00
Carlos Satorres 45085cccc8 refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:54:51 +02:00
Carlos Satorres 813c4ede00 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:22:49 +00:00
Carlos Satorres eaffd61579 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:21:47 +02:00
Carlos Satorres 0661bf8fa9 refs #5066 remake sql without ROW_ORDER 2023-05-30 12:21:44 +02:00
Carlos Satorres e7d25a6cf3 refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:08:45 +02:00
Carlos Satorres e26eedb51c refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:54:14 +02:00
Vicent Llopis 4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:52:04 +02:00
Alexandre Riera 30816f7947 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:51:42 +00:00
Carlos Satorres cf632040e7 refs #5334 workFk, clientFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 11:48:39 +02:00
Alexandre Riera 060b2fdf50 Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:34:55 +02:00
Alexandre Riera 138f03d891 refs #5137 fix back test 2023-05-30 11:34:53 +02:00
Alexandre Riera 32bdaa640e Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:30:34 +00:00
Pablo Natek 382bc06075 refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:23:07 +02:00
Alexandre Riera 632662c440 refs #5595 added userId in makeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:49:10 +02:00
Carlos Satorres 2778858705 refs #5334 search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:27:49 +02:00
Alexandre Riera e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 08:27:35 +00:00
Vicent Llopis 21448a84dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-30 10:16:34 +02:00
Carlos Satorres 107d8d1edd refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:13:49 +02:00
Vicent Llopis 7d59c6ec0c refs #5468 feat: eliminado acl nativo y añadido a salix.ACL
gitea/salix/pipeline/head Build queued... Details
2023-05-30 10:07:17 +02:00
Vicent Llopis 81a8f383aa refs #5468 feat: no depender del modulo worker
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:00:05 +02:00
Alexandre Riera 153542d2be refs #5595 taking active connection
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:49:39 +02:00
Carlos Satorres cb664ecec4 Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:18:57 +02:00
Carlos Satorres ec5a5be9e6 refs #5328 remove spaces 2023-05-30 09:18:52 +02:00
Carlos Satorres 3872078507 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 07:16:38 +00:00
Carlos Satorres d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:16:02 +02:00
Vicent Llopis ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:13:47 +02:00
Alex Moreno 8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:30:48 +00:00
Vicent Llopis 27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:14:48 +00:00
Carlos Satorres 9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-30 08:05:17 +02:00
Carlos Satorres 2d6f0bb2ce refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 15:27:50 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 15:21:37 +02:00
Carlos Satorres f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 14:46:39 +02:00
Carlos Satorres 3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 13:49:32 +02:00
Alexandre Riera 1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued... Details
2023-05-29 10:56:21 +00:00
Alexandre Riera 059467a383 refs #5137 sql moved to template
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 12:55:20 +02:00
Carlos Satorres d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 12:42:27 +02:00
Vicent Llopis d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 08:59:20 +00:00
Carlos Satorres 2e83d91006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-05-29 10:24:19 +02:00
Carlos Satorres 41b1b2fb3f fix >
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 10:02:21 +02:00
Carlos Satorres b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX 2023-05-29 10:00:33 +02:00
Pablo Natek a232e9ecea refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:26:36 +02:00
Vicent Llopis d313517e14 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:24:28 +00:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Carlos Satorres 95c438b73a refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 14:52:47 +02:00
Carlos Satorres 2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:35:12 +02:00
Carlos Satorres 3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:23:34 +02:00
Carlos Satorres ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:08:37 +02:00
Carlos Satorres 07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:25:49 +02:00
Carlos Satorres f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:15:47 +02:00
Alex Moreno 0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:58:03 +02:00
Alex Moreno 2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:21:15 +02:00
Vicent Llopis 3ecfbe2052 refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 12:03:36 +02:00
Vicent Llopis 9e8efff016 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 11:55:32 +02:00
Carlos Satorres 027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:47:04 +02:00
Carlos Satorres 10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:43:51 +02:00
Carlos Satorres 8adc104cf4 refs #5735 fix currency
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 08:39:58 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Juan Ferrer 27d4d10472 refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:32:03 +02:00
Juan Ferrer 2e0721b101 refs #5667 Fixes: Id filter, translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:22:46 +02:00
Vicent Llopis 71d8a355bd refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 15:03:22 +02:00
Vicent Llopis 96feb24f12 refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 13:28:44 +02:00
Alexandre Riera a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:22:51 +00:00
Vicent Llopis ce211b436d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 13:00:11 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Alex Moreno dd83b25bb2 Merge branch 'master' into hotfix-item_getBalance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 09:37:38 +00:00
Alexandre Riera dfac44a87b hotfix 3rd parameter to null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:35:25 +02:00
Carlos Satorres d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:25:47 +00:00
Alex Moreno a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:49:40 +00:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:56:10 +02:00
Carlos Satorres 1f24314ab2 refs #5635 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:24:01 +02:00
Alex Moreno 0e6501f306 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master 2023-05-25 07:42:58 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:34:54 +02:00
Alex Moreno 42a39b6778 refs #5706 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:22:56 +02:00
Alex Moreno 03e2b98485 hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:50:59 +02:00
Alexandre Riera de313b6418 refs #3628 Show what's before the inventory
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:40:26 +02:00
Alexandre Riera 74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:39:01 +02:00
Alexandre Riera 087fa137fd Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:14:17 +00:00
Alex Moreno 6b66eb3bb2 refs #5679 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:59:58 +02:00
Carlos Satorres d6d72ed289 refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-24 12:35:07 +02:00
Alexandre Riera 49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:19:45 +02:00
Alexandre Riera 133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:18:26 +00:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:20:07 +02:00
Carlos Satorres 9b363bc7a4 refs #5635 remove vn, smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:57:51 +02:00
Carlos Satorres 1bd54765f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition 2023-05-24 10:05:38 +02:00
Carlos Satorres a99b7cd4f1 Merge branch 'dev' into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 08:02:33 +00:00
Carlos Satorres 6294fc0435 refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:02:02 +02:00
Carlos Satorres 6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:59:04 +00:00
Carlos Satorres bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-05-24 08:09:44 +02:00
Carlos Satorres e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:05:44 +00:00
Vicent Llopis 3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:45:04 +00:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:40:11 +00:00
Alexandre Riera 97653d9b8f Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:07:33 +00:00
Alex Moreno c35e2e155f refs #5472 test(changePassword): back
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 15:12:28 +02:00
Vicent Llopis 3119ae4471 refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:12:20 +02:00
Vicent Llopis 2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:06:38 +02:00
Carlos Satorres 0dda7791f6 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:51:10 +00:00
Carlos Satorres af1f92613f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:57:11 +02:00
Vicent Llopis 0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:45:03 +02:00
Vicent Llopis c9b4c68b0c refs #5468 refactor: actualizada vista
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:41:13 +02:00
Carlos Satorres 4f5bd95d21 refs #5639 order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:23:46 +02:00
Vicent Llopis 0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:19 +02:00
Vicent Llopis b7e3e9fa71 refs #5468 feat: add testBack
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:10 +02:00
Vicent Llopis db55c3e81b refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:49:34 +02:00
Vicent Llopis 191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 12:40:49 +02:00
Carlos Satorres e2bea16e68 refs #5639 select country, paymethod
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:31:02 +02:00
Vicent Llopis 940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:21:35 +02:00
Carlos Satorres db7d3b6868 refs #5639 payMethodFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:26 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:26:31 +02:00
Vicent Llopis 96163cb07f refs #5468 feat: update acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:43:46 +02:00
Vicent Llopis cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:04:31 +02:00
Vicent Llopis 6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-23 10:03:40 +02:00
Vicent Llopis 4bed88faf5 refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:44:07 +02:00
Carlos Satorres 84abba5566 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:38:01 +00:00
Alex Moreno 9500e99b86 Merge branch 'dev' into 5579-fix-order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:17:25 +00:00
Alex Moreno 53e55de605 refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:15:31 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:13:47 +00:00
Vicent Llopis 9426ff204f refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:12:27 +02:00
Carlos Satorres 0c673e43bc refs #5639 smart-tabla defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:02:05 +02:00
Vicent Llopis aea39dd0b7 refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:45:03 +02:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:43:31 +02:00
Vicent Llopis 3b7b31deb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:31:52 +02:00
Carlos Satorres ee8685329f Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:23:19 +00:00
Alex Moreno 6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-23 08:23:16 +02:00
Carlos Satorres 8ee581eb67 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:02:17 +00:00
Alex Moreno 6f06bac0c1 Merge branch 'dev' into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:55:08 +00:00
Alexandre Riera b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:54:12 +00:00
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:53:25 +02:00
Vicent Llopis b65ebc6af3 refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 07:09:51 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Carlos Satorres 3994e65040 refs #5648 spaces fix2 2023-05-22 15:56:14 +02:00
Carlos Satorres a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 13:51:35 +00:00
Carlos Satorres 5e651d7b8c Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:30:06 +02:00
Carlos Satorres 6d147e7af7 refs #5648 fix spaces 2023-05-22 14:30:04 +02:00
Carlos Satorres 6093cb4794 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:26:57 +00:00
Carlos Satorres 9bc20493fe #refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:02:07 +02:00
Carlos Satorres 1b19035d8d refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:41:02 +02:00
Alex Moreno ddab59a10c refs #5472 refactor(changePassword): convert in async
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 09:17:40 +02:00
Carlos Satorres e9222dbcb7 Merge branch 'dev' into 5689-fixedPricesSize
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 06:31:51 +00:00
Carlos Satorres 23287e5ebf refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 08:30:23 +02:00
Carlos Satorres 32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim 2023-05-22 08:13:31 +02:00
Juan Ferrer 69b892f2fd refs #5667 Translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 16:59:39 +02:00
Vicent Llopis 8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 13:34:07 +02:00
Juan Ferrer 6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI 2023-05-19 10:56:15 +02:00
Vicent Llopis 5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 10:30:36 +02:00
Vicent Llopis 8cf988b7d2 refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 08:02:17 +02:00
Alex Moreno bbc34f04ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 07:35:23 +02:00
Carlos Satorres 2b1e951692 refs #5635 smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 15:33:54 +02:00
Alexandre Riera 58c25786a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:52:33 +02:00
Alexandre Riera d70a31bfbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes 2023-05-18 14:49:27 +02:00
Alex Moreno f54d9180b1 fix front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:44:05 +02:00
Alexandre Riera e8376c00a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:43:20 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:11:29 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Alexandre Riera 2591d2d115 refs #3628 added check & date-picker
gitea/salix/pipeline/head Build queued... Details
2023-05-18 11:42:22 +02:00
Alexandre Riera 4bcb461d36 refs #3628 added check & date-picker
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 11:41:46 +02:00
Vicent Llopis d33a84c39f refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:30:21 +02:00
Vicent Llopis 463d209d77 refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:21:30 +02:00
Vicent Llopis 9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:58:13 +02:00
Vicent Llopis b66362d313 refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:33:17 +02:00
Alex Moreno 2ef922e80c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:10:10 +02:00
Vicent Llopis a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:33:08 +02:00
Alex Moreno ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:17:31 +02:00
Juan Ferrer 48da4b13ff refs #5667 Ticket translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 17:08:20 +02:00
Alex Moreno 02451818ef typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:31:19 +02:00
Carlos Satorres 69a25d8d03 refs #5696 horas a 00
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:04:13 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Carlos Satorres c31eee4906 refs #5696 landed
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 13:35:55 +02:00
Carlos Satorres 60bfb1b079 refs #5689 fix pixels
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:53:18 +02:00
Juan Ferrer 0d51987d47 refs #5667 Client sample translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:25 +02:00
Alexandre Riera 0d980334b8 refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:00 +02:00
Juan Ferrer f9fdf80350 refs #5667 Item translations added
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:06:31 +02:00
Juan Ferrer f55e5f9f74 refs #5667 Business translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:52:13 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Carlos Satorres adafd7444b refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 10:04:44 +02:00
Vicent Llopis eaaa860e97 Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 07:27:46 +00:00
Carlos Satorres f63dd0f9a3 refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 09:05:28 +02:00
Juan Ferrer d8eeacb371 refs #5667 Translation improved
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:24:04 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Carlos Satorres 5c9ee21cfc refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 14:00:05 +02:00
Carlos Satorres 9f9963af56 refs #5334 descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 13:10:26 +02:00
Carlos Satorres d09889b08a refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 12:12:25 +02:00
Carlos Satorres 3dcdbe0223 refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 11:41:42 +02:00
Carlos Satorres 612d0a2dfb refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 09:52:48 +02:00
Carlos Satorres fd4d04756a refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 08:54:54 +02:00
Alexandre Riera d4e2049bc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-15 14:27:49 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Carlos Satorres 443821b5c2 refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:59:54 +02:00
Carlos Satorres 071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:55:35 +02:00
Carlos Satorres 598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:15:33 +02:00
Vicent Llopis d5f5115980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice 2023-05-15 11:50:09 +02:00
Carlos Satorres 87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 10:43:06 +02:00
Alex Moreno 0aa12a5efb hotFix(worker_new): use postcode not postalCode
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 09:54:40 +02:00
Carlos Satorres 8a6881bf73 refs #4764 mod tabindex
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 15:50:32 +02:00
Carlos Satorres ce62b51b29 refs #4764 remove br
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 15:08:04 +02:00
Pablo Natek 8419c76b12 refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:51:07 +02:00
Carlos Satorres ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:30:34 +02:00
Carlos Satorres 9cbf3006a0 refs #5599 futureState
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:17:51 +02:00
Vicent Llopis 3f26072787 refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 09:02:55 +02:00
Alexandre Riera 9760e50212 refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:46:12 +02:00
Pablo Natek 65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:28:19 +02:00
Carlos Satorres 0dea1dfd9e Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 15:52:35 +02:00
Vicent Llopis b10f90fbe1 refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 15:25:37 +02:00
Vicent Llopis 2ed99426ef eliminado focus
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:18:02 +02:00
Vicent Llopis 90b844062d refs #5327 add frontTest
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:17:41 +02:00
Vicent Llopis 59f4b63db7 borrado espacio
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:04:59 +02:00
Vicent Llopis a7fcd8a1bf changes 2023-05-11 10:04:15 +02:00
Vicent Llopis f00643505d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:03:07 +02:00
Vicent Llopis 8ed17d99c3 refs #5327 permite filtrar por columnas (desde el front)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 10:02:45 +02:00
Alex Moreno 7704256079 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:00:49 +02:00
Carlos Satorres 43a91194fd refs #5599 remove e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 15:59:29 +02:00
Carlos Satorres 2111ca0993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors 2023-05-10 14:49:37 +02:00
Carlos Satorres e258e779b3 refs #5599 ticketFuture
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:49:19 +02:00
Carlos Satorres 9a813c075c refs #5599 procedure y colorClass
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:43:08 +02:00
Carlos Satorres c59915f951 refs #5599 procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 13:55:36 +02:00
Vicent Llopis 74ea0ce9fd refs #5468 actualizados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 13:44:51 +02:00
Alex Moreno 29e0562c8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-10 13:33:52 +02:00
Alexandre Riera 3166a9e420 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora 2023-05-10 13:23:10 +02:00
Alexandre Riera ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 13:22:53 +02:00
Vicent Llopis 62dd64eb89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:56:50 +02:00
Carlos Satorres f4be69c85c refs #5599 select state.classColor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:55:56 +02:00
Carlos Satorres 61d6f47162 refs #5599 remove returns
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:31:58 +02:00
Alex Moreno 8c0deb6cfa test(e2e_order): fiter optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 09:16:19 +02:00
Carlos Satorres 65646d3b65 refs #4764 validServices
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 19:49:16 +02:00
Carlos Satorres 212b848131 refs #4764 check selectedvalidservices
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 19:43:55 +02:00
Carlos Satorres aa96f1eb97 refs #4764 without checkbox
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 19:42:25 +02:00
Carlos Satorres 78f337c6d4 refs 4764 quit index
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 14:56:32 +02:00
Carlos Satorres 5c8e635509 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-05-09 13:38:04 +02:00
Vicent Llopis 461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 11:33:28 +02:00
Alexandre Riera b37bde2ba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 08:14:42 +02:00
Alex Moreno 8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-05-09 07:11:09 +02:00
Juan Ferrer 2aaded4ed4 refs #5517 Fix: Show spinner when loading
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-05-08 16:30:21 +02:00
Carlos Satorres 0b2c91466e refs #5648 create vn-confirm
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 13:25:42 +02:00
Alex Moreno ebbc860ba3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-08 12:03:53 +02:00
Juan Ferrer 68b1b6c5bd refs #5517 E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:03:27 +02:00
Carlos Satorres 202544565e refs #4764 mod query post
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 11:36:52 +02:00
Alex Moreno 7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 08:56:06 +00:00
Alex Moreno 73fb940c63 refs #5472 try change-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 10:55:16 +02:00
Carlos Satorres 2c6f71b4c4 Merge branch 'dev' 2023-05-08 10:16:57 +02:00
Alexandre Riera a2055d35fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:48:09 +02:00
Alexandre Riera 372b9a2ce2 refs #5513 test getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:46:56 +02:00
Alexandre Riera d21b949ffb refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:18:53 +02:00
Carlos Satorres 0acb7906cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-05-08 08:33:37 +02:00
Carlos Satorres 3d195bddb9 refs #4764 mod model post
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-05 14:39:46 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:58:11 +02:00
Juan Ferrer ea5b032b40 refs #5517 Travel create E2E fixes 2023-05-05 13:00:45 +02:00
Carlos Satorres c0e13d3339 refs #4754 del ticket.card.service
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 12:00:37 +02:00
Carlos Satorres 80ee73a59b refs #4764 creacion de métodos y back
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 10:01:15 +02:00
Carlos Satorres 8119d38414 Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 09:35:39 +02:00
Juan Ferrer 805e678ca7 Merge branch 'dev' into 5517-e2eFix
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 08:14:13 +02:00
Juan Ferrer a48e197e46 refs #5517 E2E fixes 2023-05-05 08:12:38 +02:00
Alex Moreno 2da4289695 refs #5472 feat(vn-user): override change-password & set-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-04 15:01:29 +02:00
Vicent Llopis 404acdab6f refs #5638 fix: solucionado problema con el limit
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:51:47 +02:00
Alexandre Riera 5cdec35ed4 refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:30:10 +02:00
Alexandre Riera 8ae5a0de0f refs #5513 adding backs and models
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 12:03:47 +02:00
Juan Ferrer 677764f302 refs #5517 Fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:00:21 +02:00
Alexandre Riera 54eb0fc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:59:05 +02:00
Alex Moreno 1fa5926c17 Merge branch 'dev' into client_use_account_setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 07:06:44 +00:00
Alex Moreno b2027fddf3 fix(client): use account setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:56:14 +02:00
Alexandre Riera ad3c6dcee2 wip #5595
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 14:34:36 +02:00
Carlos Satorres dbd0e5138b refs #5328 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:12:26 +02:00
Carlos Satorres 3ac1ce403c refs #5328 myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:06:57 +02:00
Carlos Satorres 566f03c497 refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 13:03:14 +02:00
Carlos Satorres 3b2e1ca8d5 ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:36:30 +02:00
Carlos Satorres eaf425fb51 refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:30:33 +02:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:39:39 +00:00
Alexandre Riera 4c0ec6faf5 changedModel sms
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 14:26:47 +02:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head Build queued... Details
2023-05-02 11:25:17 +00:00
Alex Moreno 306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 09:42:56 +00:00
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 11:38:07 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Carlos Satorres 5436eec63e Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:00:50 +02:00
Carlos Satorres 8156c17c7d refs #5540 del jasmine 2023-05-02 10:00:47 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Javi Gallego ed6b2cf25b refs #5615
gitea/salix/pipeline/head This commit looks good Details
2023-05-01 14:57:50 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Carlos Satorres fb59371d54 refs #5540 quit logs 2023-04-28 14:38:49 +02:00
Carlos Satorres 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Carlos Satorres c0deb745d6 refs #5540 arreglo en supplier 2023-04-28 14:03:21 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Alex Moreno e00edf0266 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-04-28 12:06:45 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 08:36:47 +00:00
Carlos Satorres cdbbec9d36 refs #5540 validate
gitea/salix/pipeline/head Build queued... Details
2023-04-28 10:21:54 +02:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Carlos Satorres b8f7f7bd69 refs #5540 create validateIban
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 09:07:06 +02:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Vicent Llopis 87ffd2668e refs #5468 scope para VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 15:06:05 +02:00
Vicent Llopis 1597f7ab69 refs #5468 permitir acceso al módulo 'Usuarios' 2023-04-27 15:05:41 +02:00
Carlos Satorres 66986d3c21 Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:08:28 +00:00
Pablo Natek 51624882e8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:05:12 +00:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Carlos Satorres d15a671359 refs #5540 traduccion 2023-04-27 11:40:42 +02:00
Carlos Satorres 07148f6c29 refs #5540 mon message
gitea/salix/pipeline/head Build queued... Details
2023-04-27 11:31:26 +02:00
Alexandre Riera 3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:42:21 +00:00
Carlos Satorres f8f4e14351 Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit is unstable Details
2023-04-27 10:40:01 +02:00
Carlos Satorres dd4d0bca84 refs #5540 delete tinIsValid, solve test back, e2e 2023-04-27 10:39:58 +02:00
Alex Moreno 9b13e3fd2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 07:23:25 +02:00
Pablo Natek 990bfc63a8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 16:10:39 +00:00
Vicent Llopis 2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:58:34 +02:00
Vicent Llopis 22b223038a delete focus 2023-04-26 14:56:07 +02:00
Vicent Llopis 8bb8b8cfba refs #5594 fix backTest
gitea/salix/pipeline/head Build queued... Details
2023-04-26 14:55:37 +02:00
Vicent Llopis 09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 14:46:16 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:49:08 +02:00
Vicent Llopis c69e038a56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:45:54 +02:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Vicent Llopis c580be2790 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 12:07:34 +02:00
Alexandre Riera 1219cfcc5c refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:03:17 +02:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Vicent Llopis 2e5a43af68 refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:40:21 +02:00
Carlos Satorres b25071f52b refs #5316 solve e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 11:40:18 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Carlos Satorres 899ef23541 refs #084200 test back solve
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:03:01 +02:00
Vicent Llopis d6ff61b768 refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 09:48:02 +02:00
Alex Moreno 73153071d6 Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:56:46 +00:00
Alex Moreno af0523a155 refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 15:17:45 +02:00
Pablo Natek e8ce8e42fd refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:25:22 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Alexandre Riera 83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 11:25:29 +02:00
Alex Moreno 11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:40:36 +02:00
Alex Moreno 4cb231759f feat(State/Supplier): replace hasRole to acls
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:15:05 +02:00
Alexandre Riera edb1e2197c Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 06:23:08 +00:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Carlos Satorres 40da3dfe52 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 12:53:28 +00:00
Carlos Satorres 08e890d6d9 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 12:40:57 +00:00
Carlos Satorres 1088422360 refs #4764 boton abonar y datos 2023-04-24 13:14:38 +02:00
Juan Ferrer a053764122 refs #5517 E2E fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 12:59:56 +02:00
Alex Moreno 8502b74dee feat(): replace hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 11:07:04 +02:00
Juan Ferrer 081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations 2023-04-24 10:44:42 +02:00
Carlos Satorres 4473cc11c7 Merge branch 'dev' into 5439-inheritRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:43:19 +00:00
Carlos Satorres 210bd949d2 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:38:06 +00:00
Carlos Satorres 1717f03ccc Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 07:38:06 +00:00
Vicent Llopis 4983aa1632 refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 09:11:09 +02:00
Carlos Satorres 5ec0cd962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-04-24 09:04:33 +02:00
Vicent Llopis 9b432bac85 refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:57:10 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:51:41 +00:00
Carlos Satorres cd4f66e292 refs #5540 arreglar e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:48:35 +02:00
Vicent Llopis bf558761a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:45:56 +02:00
Alexandre Riera 0a1583aa54 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:42:32 +02:00
Alex Moreno ef12fdf889 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:02:34 +00:00
Alex Moreno 5e33395534 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:02:00 +00:00
Vicent Llopis 5b7ca82509 Merge branch 'dev' into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 04:58:30 +00:00
Alexandre Riera 6609f96f92 Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:56:15 +00:00
Alexandre Riera bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:48:06 +00:00
Alexandre Riera 2975e7fae3 hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:46:46 +02:00
Vicent Llopis e24366707b refactor: añadido focus a la seccion usuarios
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:26:12 +02:00
Vicent Llopis 2b74ab43ae refactor front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:12:53 +02:00
Vicent Llopis 9f04581862 refs #5542 "importar reclamacion" crea un registro en ticketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:00:28 +02:00
Vicent Llopis 38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono 2023-04-21 13:59:28 +02:00
Alex Moreno faee5ccd7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:53:07 +02:00
Vicent Llopis ea1035311e Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 11:30:58 +00:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Carlos Satorres a9caa92f5c refs #4764 boton abonar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 12:46:01 +02:00
Carlos Satorres 397d8f658e refs #5540 error trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:41:50 +02:00
Vicent Llopis 83f71cdd36 refactor: mostrar en columnas visibles 'Frágil'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:31:23 +02:00
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:53:21 +02:00
Alexandre Riera af1ad7e08c fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 09:47:34 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 08:20:38 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 9694a35343 refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 19:46:57 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Carlos Satorres 33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 14:31:46 +02:00
Vicent Llopis ec9a5722c2 refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:58:49 +02:00
Carlos Satorres d6e6dab03b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:55:52 +02:00
Carlos Satorres b4183c2698 refs #5436 mod de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:33:28 +02:00
Carlos Satorres c103eeab7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo 2023-04-20 10:40:22 +02:00
Carlos Satorres 237c83c6f5 refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:20:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Carlos Satorres b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:23:46 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alexandre Riera 84c2512847 refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:51:25 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Carlos Satorres a559c1f648 refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:02:04 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 15:03:23 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Joan Sanchez c3443ecc7c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:37:20 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Joan Sanchez a0d8ed1433 E2e fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 11:33:36 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:33:15 +00:00
Joan Sanchez a5f6991511 continue
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:18:44 +02:00
Joan Sanchez aabc4ec58d fix(consumption): continue queue if client mailing fails
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:08:04 +02:00
Alexandre Riera 28a7722bb6 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:01:42 +00:00
Joan Sanchez fded7d062b section fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:23 +02:00
Vicent Llopis b3e7cedd1e refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:12 +02:00
Vicent Llopis c5225cb632 refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:23:19 +02:00
Vicent Llopis 48cd23750e refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:09:09 +02:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:32:22 +02:00
Pablo Natek 3636543f73 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:19:23 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +02:00
Alexandre Riera 2bc190b01e Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:49:41 +00:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Joan Sanchez f53ebb7641 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:59:34 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-17 06:44:17 +00:00
Carlos Satorres af8603185c refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:35:44 +02:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00
Juan Ferrer 2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute 2023-04-15 01:51:38 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Alexandre Riera ad3836552e refs #5518 sections added
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 14:16:29 +02:00
Vicent Llopis 4c18efa589 refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:05:57 +02:00
Joan Sanchez 35f94c58b7 reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:04:40 +02:00
Vicent Llopis 83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-14 10:39:16 +02:00
Alexandre Riera b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 07:08:02 +00:00
Juan Ferrer b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 14:18:01 +02:00
Carlos Satorres a2ddbd8a66 refs #5284 test update
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 14:04:10 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:47:18 +02:00
Alexandre Riera ac4772e44e refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:46:29 +02:00
Carlos Satorres 90268a79b0 refs #5284 test createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:41:10 +02:00
Vicent Llopis 2ada64e1bf refs #5517 eliminadas traducciones duplicadas
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:49:50 +02:00
Alexandre Riera 71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:45:05 +02:00
Carlos Satorres 44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo 2023-04-13 08:44:56 +02:00
Vicent Llopis 3790e3457f refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +02:00
Carlos Satorres ad267c933c refs #5540 country.code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 08:30:33 +02:00
Pablo Natek 9594bd68b5 refs #4795
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 21:10:50 +02:00
Juan Ferrer 7e1d6f4339 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:33:23 +00:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Carlos Satorres 60103fa80a refs #5540 validacion nif
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 14:39:40 +02:00
Carlos Satorres ef6e85532e refs #5213 cambios e2e, descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 14:20:05 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Carlos Satorres 117849f093 refs #5540 supplier js
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:03:55 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 10:02:06 +02:00
Pablo Natek 1456da58f5 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 15:41:45 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:19:54 +00:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 15:04:49 +02:00
Vicent Llopis d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito"
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 14:57:56 +02:00
Pablo Natek ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 11:56:33 +00:00
Pablo Natek 1770b8c038 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:42:28 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Vicent Llopis ec03c6edfa fix intermittent backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:23:33 +02:00
Alexandre Riera 161fc25c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:01:21 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:07:55 +00:00
Joan Sanchez fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:06:04 +00:00
Vicent Llopis cd6a6f65b3 Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:45:20 +02:00
Vicent Llopis cc9ce65678 test 2023-04-11 07:44:25 +02:00
Vicent Llopis ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 09:58:07 +00:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:32:05 +00:00
Vicent Llopis d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:08:10 +00:00
Vicent Llopis 8a297469d6 refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Vicent Llopis faab024e24 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 09:59:45 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:07:35 +00:00
Joan Sanchez a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:05:18 +00:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Vicent Llopis 6fc2867551 permite decimales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:05:37 +02:00
Alexandre Riera c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 05:44:33 +00:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:06:33 +02:00
David Domenech 44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:00:08 +00:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 06:51:21 +00:00
Carlos Satorres 7d3c6a98f3 refs #5439 search panel solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:48:15 +02:00
Vicent Llopis fb5969a120 refs #5275 add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:43:47 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:19:50 +02:00
Vicent Llopis e97b5a9f80 refs #5275 fix backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:54:56 +02:00
Vicent Llopis 28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:36:53 +02:00
Carlos Andrés e342852ed8 Merge branch 'master' into 5529-invoicingFixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-04-04 13:05:49 +00:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
Vicent Llopis 35d19e586a add translatiojn
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:27:16 +02:00
Vicent Llopis 7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:12:20 +00:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:09:55 +02:00
Joan Sanchez c126c6044a Updated format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 13:55:44 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +02:00
Alexandre Riera 9380b88460 refs #5437 back and test deprecated
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:40:03 +02:00
Vicent Llopis 0bfa4c54aa fix: inserta en workerTimeControlMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 09:52:46 +02:00
Alexandre Riera 1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:47:31 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 21b7050cfd refs #4856 otros usuarios pueden actualizar el estado 2023-04-04 09:29:40 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 08:40:03 +02:00
Vicent Llopis d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2 2023-04-04 08:27:27 +02:00
Vicent Llopis 862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Vicent Llopis 67689695e4 refs #5275 filtra por defecto por el this.vnConfig.warehouseFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:29:19 +02:00
Vicent Llopis e1bfdc3f3c eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 11:13:40 +02:00
Carlos Satorres 60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-30 08:26:45 +02:00
Carlos Satorres 4edb2463b8 refs #5250 eliminacion isEnabled 2023-03-30 08:23:53 +02:00
Vicent Llopis 5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 08:14:17 +02:00
Joan Sanchez 6aca23e466 Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:23:29 +00:00
Joan Sanchez cafb21d90b Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev
Reviewed-on: #1384
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:21:24 +00:00
Joan Sanchez 26bddef5e5 Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev
Reviewed-on: #1394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:50 +00:00
Joan Sanchez ea60e31361 Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev
Reviewed-on: #1396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:28 +00:00
Joan Sanchez 30a4356139 Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1414
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:18:44 +00:00
Joan Sanchez 6366af9a15 Merge pull request 'refs #5490 traducción corregida' (!1415) from 5490-arregloExpedition into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1415
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:18:21 +00:00
Vicent Llopis d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 11:27:48 +02:00
Vicent Llopis b8da868095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-29 09:22:23 +02:00
Vicent Llopis 3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 09:11:40 +02:00
Alexandre Riera 9a713d2753 refs #5184 stmts removed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:48:54 +02:00
Alexandre Riera 3ad85c0de3 refs #5184 subselect deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:44:35 +02:00
Vicent Llopis c53c54b6cd refs #5275 feat: modificar masivamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:59:08 +02:00
Carlos Satorres bf5f1011e8 refs #5490 traducción corregida
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:56:20 +02:00
Vicent Llopis b4e04fcdad refs #5275 feat: colorear fechas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:40:14 +02:00
Alexandre Riera 69be91b964 refs #5184 fix back test, added e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 13:45:26 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Alexandre Riera 695444f6ae refs #5184 back and front tests added
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 11:34:14 +02:00
Vicent Llopis fb1b39da17 refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 10:30:02 +02:00
Carlos Satorres 809c24f6cf Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 10:07:18 +02:00
Carlos Satorres 564165dc0f refs #5250 Self.validatesPresenceOf 2023-03-28 10:07:14 +02:00
Vicent Llopis 06ac8f9910 refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 09:41:39 +02:00
Alexandre Riera 05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:26:11 +02:00
Alexandre Riera 87d0dc3cec refs #5092 changed name to negative bases
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:25:41 +02:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 14:29:22 +02:00
Alexandre Riera 188e592d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 11:20:05 +02:00
Carlos Satorres 1302665d98 refs #5436 showSucces
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 10:00:00 +02:00
Alexandre Riera 0c8fe855ac refs #5418 lateral search panel added, missing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 09:11:29 +02:00
Alexandre Riera 8b4121e021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 08:38:35 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 05:39:22 +00:00
Carlos Satorres b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:48:31 +00:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Vicent Llopis a32dea0acd Merge branch 'dev' into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:00:22 +00:00
Vicent Llopis f689d35100 refs #5410 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:05:17 +01:00
Joan Sanchez 00a0f88dc4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:03:23 +01:00
Joan Sanchez e67a40714c Claim log hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:59:55 +01:00
Vicent Llopis 6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:43:13 +01:00
Carlos Satorres fa78649607 refs #5439 url filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:54:03 +01:00
Vicent Llopis 5784f05fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:34:04 +01:00
Alexandre Riera 0baccc4745 refs #5206 fix tests front
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:25:37 +01:00
Alexandre Riera 8f2398bc8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:12:50 +01:00
Vicent Llopis 92aed3eac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:11:35 +01:00
Vicent Llopis a45308c6a5 refs #5342 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 07:58:27 +01:00
Vicent Llopis 0f6092483c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:51:31 +01:00
Alexandre Riera 24d032910a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:58:31 +01:00
Vicent Llopis afdfe5e3f3 refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 14:55:19 +01:00
Vicent Llopis 2513377add Merge branch 'dev' into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 13:38:08 +00:00
Joan Sanchez ea50da8a19 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:33:10 +01:00
Carlos Satorres 36af9d45e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 11:56:40 +01:00
Vicent Llopis 805df64bb2 fallo cantidad reclamados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:54:04 +01:00
Alexandre Riera c6fc2dee24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:53:11 +01:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 46e61543a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:29:03 +01:00
Vicent Llopis 34126119e2 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:02:22 +01:00
Carlos Satorres 79c42384ee refs #5439 role actualizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:26:06 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:20:33 +01:00
Carlos Satorres 3fd1e7a086 refs #5439 se elimina el filtro de fecha añadido
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 15:41:36 +01:00
Vicent Llopis 0579c563b9 refs #5327 ordernar por columnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 15:03:12 +01:00
Joan Sanchez fcd422eb49 added relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 14:55:54 +01:00
Carlos Satorres 1ab8570ed3 Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:28:07 +00:00
Carlos Satorres b2cc79a98e Merge branch 'dev' into 5432-propiedadesBotonMas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:24:32 +00:00
Vicent Llopis 27bb50ad12 refs #5342 esta tabla ya se borra en el proc
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 12:17:48 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis 18afcbabc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-22 10:20:55 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Vicent Llopis bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-22 09:31:08 +01:00
Alexandre Riera 700151b500 refs #5092 amount <> 0
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 08:18:56 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 41c79263c4 refs #5410 feat: envia email cuando se añade una nota
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:53:36 +01:00
Joan Sanchez d209b35071 Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1392
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-21 10:22:37 +00:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Joan Sanchez 3a922b453f Merge branch 'dev' into 5241-virtual_pos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:10:34 +00:00
Joan Sanchez 12a9ff599b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:05:27 +01:00
Joan Sanchez 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +01:00
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +01:00
Carlos Satorres 1bc3103d9f refs #5439 filtro comercial
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 08:44:28 +01:00
Joan Sanchez 634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 23:09:17 +01:00
Carlos Satorres da05140635 Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:14:11 +01:00
Carlos Satorres 306573b1bf refs #5439 campos fecha y salesperson
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:11:55 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Carlos Satorres 78d8bbd82a refs #5423 tercer decimal en entrada 2023-03-20 10:44:44 +01:00
Alexandre Riera 61a0d8bcb2 refs #5092 showing clients with multiple negative bases
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 10:15:18 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 09:54:02 +01:00
Carlos Satorres 9e42ab52ce refs #5425 modificación usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-17 09:32:20 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Carlos Satorres 9565bb33f2 refs #5425 modificacion de los campos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:12:54 +01:00
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:01:19 +01:00
Vicent Llopis 5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-16 13:55:54 +01:00
Vicent Llopis bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 13:55:21 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:38:04 +01:00
Vicent Llopis 2f2d65bfd6 refs #5342 feat: añadido icono en los tickets que tengan sales fragiles
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:33:24 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Carlos Satorres aadb796adf Merge branch 'dev' into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:12:56 +00:00
Alexandre Riera 3f356335db refs #5092 added popovers
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:47:58 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:16:50 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Carlos Satorres 70beaf9b6c refs #5423 añadido 3r decimal
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:03:16 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez 8fda595c2e Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1375
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:39:00 +00:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:34:02 +00:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Joan Sanchez a8049c5b2c Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1377
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-16 06:28:03 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Joan Sanchez d9296c139d Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1388
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:25:18 +00:00
Joan Sanchez 1f52326091 Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-16 06:22:45 +00:00
Joan Sanchez 4f0ad00a6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-03-16 07:20:18 +01:00
Joan Sanchez 596a017cfd Don't throw error on file unlink
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-03-16 07:18:29 +01:00
Joan Sanchez 0d5272de30 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 15:05:43 +00:00
Joan Sanchez a947666838 refactor(imageQueue): remplaced sharp with gm
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 14:24:30 +01:00
Vicent Llopis 1b8ed05f71 refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 13:28:28 +01:00
Alexandre Riera 6609cce065 refs #5056 minHeightBetweenTrays
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 12:14:58 +01:00
Alexandre Riera f706b66efc refs #5056 added divisible in wagonType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 11:57:09 +01:00
Alexandre Riera 53bca1e8a3 refs #5056 added fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:36:10 +01:00
Alexandre Riera 6a2542758b refs #5056 added fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 10:29:44 +01:00
Vicent Llopis 38bf49c0b6 refs #5410 fix: se mantenien los checkbox marcados al paginar
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 08:40:53 +01:00
Joan Sanchez bdb86a432f Merge branch '5182-print_publish' of https://gitea.verdnatura.es/verdnatura/salix into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 08:07:17 +01:00
Joan Sanchez f052af92cd Proper template name 2023-03-15 08:07:14 +01:00
Joan Sanchez dc936fe690 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 07:05:14 +00:00
Pablo Natek 59a87ba519 Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 14:02:25 +00:00
Vicent Llopis c51e542235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 13:43:59 +01:00
Carlos Satorres 5f64c23495 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 11:12:04 +00:00
Vicent Llopis 1047ac0b64 refs #4980 fix: la sección no estaba filtrando por el filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 10:18:59 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Vicent Llopis 29df1ba894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 08:00:02 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Vicent Llopis 1693907ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 07:41:36 +01:00
Pablo Natek 584f25dd77 Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 16:24:31 +00:00
Carlos Satorres e947672c69 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 14:36:51 +00:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #5182
2023-03-13 15:05:19 +01:00
Joan Sanchez b58135f611 Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1379
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-13 09:37:42 +00:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:22:36 +00:00
Alexandre Riera 0248c3c9e0 refs #5056 models and tables added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 07:34:49 +01:00
Alexandre Riera eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 06:10:51 +00:00
Joan Sanchez 1b984f4325 Event callback
gitea/salix/pipeline/head This commit looks good Details
2023-03-12 20:51:22 +01:00
Vicent Llopis 5cb28036c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 14:25:55 +01:00
Joan Sanchez 9bc86b1617 Added missing relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 13:29:11 +01:00
Pablo Natek 8a4d9bd2bf refs #5211
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 12:52:51 +01:00
Alexandre Riera efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 11:50:11 +00:00
Alexandre Riera c4d6a19666 refs #5092 download as csv button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:49:20 +01:00
Alexandre Riera 874fd0656c refs #5206 url gets params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:05:16 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Pablo Natek 63ccb26bf3 refs #5151
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 08:17:10 +01:00
Vicent Llopis b24b6d4121 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback 2023-03-10 07:46:16 +01:00
Pablo Natek 901a8ab112 refs #5151 botones
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 14:34:06 +01:00
Carlos Satorres 5a0b567908 Merge branch 'dev' into 5380-m3/itemMaxSize
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 13:29:06 +00:00
Carlos Satorres 08254e28bb refs #5380 mod label max m3
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 14:24:00 +01:00
Vicent Llopis c105316a04 delete testBack
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 10:05:24 +01:00
Vicent Llopis 9094c4f1cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:42:08 +01:00
Vicent Llopis 223b8f6d00 fix: intermittentBack test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:41:51 +01:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:29:43 +00:00
Alexandre Riera a5f6d37f0f hotfix reload card, improved icon message 2023-03-09 09:29:11 +01:00
Alexandre Riera 2363828092 hotfix clientUnpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:54:03 +01:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:31:38 +01:00
Vicent Llopis c46d325e23 fix: add transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 07:58:39 +01:00
Alexandre Riera 9ff920c67e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 06:50:33 +00:00
Carlos Satorres 7426c97479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5380-m3/itemMaxSize 2023-03-08 15:11:55 +01:00
Vicent Llopis e20464cc7c update css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:14:06 +01:00
Carlos Satorres 6d7874d3ab refs #5380 JSON modificado HTML arreglado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:12:21 +01:00
Carlos Andrés 32429a58e0 refs #5000 remove consolelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 12:36:53 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Vicent Llopis 79023fbfaf feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:16:53 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Vicent Llopis f461c75af1 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:06:31 +01:00
Vicent Llopis 776f7783c6 refactor code 2023-03-08 12:06:20 +01:00
Vicent Llopis 0396d3707c refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:47:10 +01:00
Alexandre Riera b1d5a2ba1a Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 10:46:16 +00:00
Joan Sanchez 4d2d75e066 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 10:19:11 +01:00
Joan Sanchez aeb50b2c19 Removed callback syntax
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 10:19:02 +01:00
Vicent Llopis 760690a625 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:51:21 +01:00
Carlos Satorres 3d1f640e08 refs #5380 m3Max add and mod itemMaxSize 2023-03-08 09:19:57 +01:00