Commit Graph

730 Commits

Author SHA1 Message Date
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
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 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
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
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
Vicent Llopis 61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:43:23 +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
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
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
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
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
Vicent Llopis 929b29e7e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token 2023-06-08 13:14:33 +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 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
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
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
Vicent Llopis 3fdb546d86 refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 10:28:29 +02: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 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 7311e79273 fix(vn-model): rewriteMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 15:07:54 +02:00
Alex Moreno 5d6eaca6b8 refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 15:20:07 +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
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
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
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 b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX 2023-05-29 10:00:33 +02:00
Carlos Satorres 138d158f4f #refs 5684 remove and mod selectors
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:11:41 +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
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 292d9e038d typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:38:11 +02:00
Alex Moreno 6b66eb3bb2 refs #5679 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:59:58 +02:00
Alexandre Riera 856dcf18cb refs #5677 locations
gitea/salix/pipeline/head Build queued... Details
2023-05-24 12:17:41 +02: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
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
Alex Moreno 7704256079 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:00:49 +02:00
Alex Moreno a345265a89 refs #5488 specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 14:09:06 +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 68b1b6c5bd refs #5517 E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:03:27 +02:00
Alexandre Riera b3100d2653 refs #5595 remove OkPackets from logIn and logOut
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:55:36 +02:00
Alex Moreno 5eca583c62 refs #5472 feat(vnUser): override setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 15:19:19 +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
Alex Moreno bf3aac70f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 11:37:07 +02:00
Alex Moreno 79e7e7c604 refs #5472 feat: add change-password section
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 15:16:13 +02:00
Alex Moreno 48be8b9fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-02 11:27:14 +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 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Carlos Satorres cdbbec9d36 refs #5540 validate
gitea/salix/pipeline/head Build queued... Details
2023-04-28 10:21:54 +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
Alex Moreno 42fc0b62d8 refs #5472 feat(user): add passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 15:18:27 +02:00
Carlos Satorres e1864fec09 arreglo json
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 13:26:22 +02: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 07148f6c29 refs #5540 mon message
gitea/salix/pipeline/head Build queued... Details
2023-04-27 11:31:26 +02:00
Alex Moreno 34bb216f17 deploy(231601): dev to test
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:53:54 +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
Alexandre Riera 91b2d15234 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 08:53:50 +02: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
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
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alex Moreno 9766008ca9 fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 10:04:14 +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
Alex Moreno 239685b43f (231401) master to test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:52:48 +02:00
Alex Moreno 7df4a2b15d fix(231401): fix tests and fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:25:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Juan Ferrer dc853213b8 refs #5553 Allow to skip default transaction timeout
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 20:33:39 +02:00
Joan Sanchez d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 13:14:57 +02:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02: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
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
Juan Ferrer 378400c6d2 refs #5553 Image scrubing method improved
gitea/salix/pipeline/head This commit looks good Details
Remove & dryRun options, check that collection exists, performance improved, exclusive lock
2023-04-17 18:19:25 +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 add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Joan Sanchez f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-13 12:00:22 +02:00
Joan Sanchez b5f2cf3711 Added unit test & translation fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 11:54:56 +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
Alexandre Riera eed57c9b4e refs #5546 removed log tests
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 14:47:07 +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
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 2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02: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
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
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
Joan Sanchez cc759373a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-29 15:20:57 +02:00
Joan Sanchez d5fd15224e fix(sqlConnector): handled malformed json parse
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #4862
2023-03-29 14:57:14 +02: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
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 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 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 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
Carlos Andrés 6b375cbaaa refs #5000 InvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:34:41 +01:00
Carlos Andrés 2a6848c09a refs #5000 invoiceOutGlobal 2023-03-14 09:17:39 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01: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
Alexandre Riera e66974f77f refs #5036 removed grabUserLog function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:02:34 +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
Joan Sanchez 23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 06:50:16 +00:00