Commit Graph

7252 Commits

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