Commit Graph

14215 Commits

Author SHA1 Message Date
Vicent Llopis 1fcf5a85a6 Merge pull request 'fixes #4990 acquireTimeout to 60000' (!1209) from 4990-fix-jenkins-backTests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1209
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2022-12-15 13:27:15 +00:00
Alexandre Riera 45317c0850 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-12-15 14:26:10 +01:00
Alexandre Riera 92a961ecc9 refs #3302 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:24:57 +01:00
Alexandre Riera 0af4f337e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:23:44 +01: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 bab6fa0c9d acquireTimeout: 60000
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:02:18 +01:00
Alex Moreno 5cc8764a3f acquireTimeout 10000
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 13:54:17 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:52:34 +01:00
Alexandre Riera 5a975d0b05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:22:36 +01:00
Carlos Andrés fc69098c62 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 08:18:24 +00:00
Alex Moreno 279456b377 Merge branch 'dev' into 4919-module_code
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:58:18 +00:00
Alexandre Riera 33196acac6 refs #4928 fixture notification, fix test supplier
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 08:31:47 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez 3b9cd5be09 Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1200
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-15 07:21:01 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Alex Moreno 0ad4a1ae3a Merge pull request 'add reset-password' (!1207) from hotFix-reset-password into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1207
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:16:48 +00:00
Alex Moreno 8d7757ddbe add reset-password
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:40:51 +01:00
Vicent Llopis 4e8896202a delete: transacción innecesaria
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:17:26 +01:00
Vicent Llopis 859c084430 refactor: movidos changes sql 2022-12-15 07:17:13 +01:00
Vicent Llopis 6793b8e9a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-15 07:13:09 +01:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +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
Joan Sanchez 11db08b32b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-12-14 14:20:41 +01:00
Joan Sanchez a86636bee4 Use proper module codes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:49:49 +01:00
Vicent Llopis e616835600 delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:40:28 +01:00
Vicent Llopis f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:31:56 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:10:33 +01:00
Alex Moreno d753243061 fix package.json
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 12:33:35 +01:00
Alexandre Riera 0c98ac2bb2 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-14 12:27:17 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alexandre Riera dc33a46eee refs #4926 ticket tour future refactor
gitea/salix/pipeline/head This commit looks good Details
2022-12-14 12:17:12 +01:00
Alex Moreno b378598113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-14 10:15:11 +01:00
Alex Moreno c14059df75 fix(supplier_consumption): fix JOIN
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 10:12:51 +01:00
Alexandre Riera f4ed7781b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 08:30:36 +01:00
Alexandre Riera f00fdcff7c refactor sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 08:06:02 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:00:46 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 13:37:25 +01:00
Alexandre Riera 72c27f7176 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-12-13 12:37:56 +01:00
Alexandre Riera 95967a29db refs #4928 email template added and proc modified
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 11:50:17 +01:00
Vicent Llopis b852ab8e1f delete change
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 10:03:23 +01:00
Vicent Llopis 91f955ccf5 refactor: move sql changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 09:56:05 +01:00
Vicent Llopis e4dbeb0b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-13 09:54:56 +01:00
Alex Moreno 8900656b14 Merge branch 'dev' into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 08:29:32 +00:00
Alexandre Riera 1f0f5adcd8 Merge pull request 'fixes #4893 Comprobar formato del correo al insertar' (!1196) from 4893-formato-correo into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1196
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-13 08:13:40 +00:00
Alexandre Riera 86a58a26ea Merge branch 'dev' into 4893-formato-correo
gitea/salix/pipeline/head This commit looks good Details
2022-12-13 08:07:48 +00:00
Alex Moreno 7c992746f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 08:32:23 +01:00
Alex Moreno f9200dd178 Merge branch '4658-createWorker' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-13 08:31:40 +01:00
Alex Moreno e7100c3e5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 08:15:41 +01:00