Commit Graph

590 Commits

Author SHA1 Message Date
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:04:45 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Vicent Llopis 903a42683d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-30 12:45:17 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:30:39 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Alexandre Riera 355c9d855d Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 07:59:49 +00:00
Alexandre Riera a12f629690 refs #5036 corrections
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:52:33 +01:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 15:49:30 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:11:46 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:44:19 +01:00
Alexandre Riera 635e787cce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:26:05 +01:00
Alexandre Riera 96becec9d3 refs #4564 mixin vn-report created
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 10:12:34 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 15:36:39 +01:00
Vicent Llopis b7004e6a76 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-01-17 12:50:34 +01:00
Alexandre Riera 2b7383af74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:11:19 +01:00
Alex Moreno 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01:00
Guillermo Bonet 3d4600d70d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-16 12:26:10 +01:00
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 10:33:35 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Alexandre Riera 41671e8a3a refs #4927 modified hook to check name & country
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 08:38:29 +01:00
Guillermo Bonet 868c2aaaef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:25:51 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:16:38 +01:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:24:55 +01:00
Alexandre Riera bebbe1c846 refs #5036 fixed transaction
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:24:22 +01:00
Guillermo Bonet e0e34595f4 refs #4975 Added translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-09 18:46:19 +01:00
Vicent Llopis 5a5e4c5afb feat: solo coge los tickets que no esten eliminados
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 14:47:52 +01:00
Alexandre Riera e0fa7609cb refs #5036 transaction added
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 13:49:35 +01:00
Vicent Llopis d16235cba9 fix: show error when is negative base
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 10:55:56 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 11:24:18 +01:00
Guillermo Bonet a46c2ced7c refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:26:07 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera 900b378c88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 07:56:38 +01:00
Carlos Andrés 31d7145c51 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 13:28:34 +00:00
Alex Moreno 4b16b413dc fixes #4990 acquireTimeout to 60000
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:09:35 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Carlos Andrés 41b7b6ab06 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 08:24:11 +00:00
Vicent Llopis 444d495b7f refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:22:13 +01:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:29:39 +01:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Carlos Andrés 6b76804913 refs #4865 Sintaxis mensajes rocket
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:52:15 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Alex Moreno 314e98b838 fix: nested router
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:57:52 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera d7843f3298 Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:24:55 +01:00
Alexandre Riera 34fb80beec fix translations 2022-11-22 14:24:19 +01:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alex Moreno 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 13:20:52 +01:00
Alexandre Riera 607f61092a Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:06:10 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:03:55 +01:00
Vicent Llopis 284837083c feat: coge el idioma local
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 12:34:18 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera 03ea2b4f11 refs #4700 translations
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:55:27 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Vicent Llopis 1bc8cf52d5 add translate
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:20:36 +01:00
Vicent Llopis d34a4ae992 add translate
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:19:25 +01:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Vicent Llopis 7fc18c89df feat: error handlers
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 13:57:54 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:04 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:48:36 +01:00
Alex Moreno 9c671ed3a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:47:00 +01:00
Alex Moreno 755a1667dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:33:07 +01:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +01:00
Vicent Llopis d9107719fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-10-31 15:04:33 +01:00
Vicent Llopis 3243d35bd7 feat: send email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 14:48:37 +01:00