Commit Graph

7150 Commits

Author SHA1 Message Date
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 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 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
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
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
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
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
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
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
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
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 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