Commit Graph

14175 Commits

Author SHA1 Message Date
Joan Sanchez 0208b31f44 Naming rollback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:12:26 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno 9b0134cb1c Merge pull request '4658-createWorker' (!1236) from 4658-createWorker into dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:30:51 +00:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Javi Gallego 07a75c4cb4 Merge pull request 'link' (!1263) from #5110-qlabel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1263
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-23 06:52:53 +00:00
Joan Sanchez 052e7b3c4a Merge branch 'dev' into #5110-qlabel
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 06:47:02 +00:00
Alexandre Riera be86e7cac1 Merge pull request 'fixes #4945 Dejar de buscar por tag 'Nombre temporal'' (!1258) from 4945-dejar-buscar-tag-nombreTemporal into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-23 06:04:28 +00:00
Javi Gallego 30885a499e link
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-21 07:29:27 +01:00
Alexandre Riera a473d3a6f9 refs #4945 changed input-number for autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:01:13 +01:00
Alexandre Riera 199fabbb1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:11:52 +01:00
Alex Moreno ace7a5939e move to changes 230401
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:33:59 +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 a3b580e27d refs #4945 item.relevancy comment
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:01:19 +01:00
Joan Sanchez 208f6f50d0 Updated package version
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:43:27 +01:00
Joan Sanchez fbbca1dc2e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-01-20 07:42:51 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Joan Sanchez a5decd3166 Updated version
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:15 +01:00
Joan Sanchez 9072f3696d Merge pull request '4903-workerTimeControl_sendMail' (!1261) from 4903-workerTimeControl_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1261
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-20 06:21:02 +00:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:56:39 +01:00
Vicent Llopis 921b5cf3fb add excluded test
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:54:36 +01:00
Vicent Llopis 92a9004d98 fix: borrada propiedad transaction cuando se hace commit 2023-01-19 08:54:26 +01:00
Alexandre Riera 16d89029e4 Merge branch '4945-dejar-buscar-tag-nombreTemporal' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:51:06 +01:00
Alexandre Riera 89a7aa5887 refs #4945 refresh structure 2023-01-18 14:51:03 +01:00
Vicent Llopis 38e4349e17 borrado comentario
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:25:24 +01:00
Vicent Llopis 2c995208d1 fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:23:05 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Vicent Llopis 7368b572a0 fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:05:02 +01:00
Pau 5507b2de21 Merge pull request 'closes 4732 etiquetas con QR para previa y item' (!1163) from 4732-previa-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1163
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2023-01-18 08:26:10 +00:00
Pau 5e198b8541 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:15:45 +00:00
Alexandre Riera 52b12d52b1 Merge pull request 'fixes #5020 Borrado lógico en la tabla ItemPackingType' (!1257) from 5020-borradoLogico-IPT into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1257
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-18 08:15:08 +00:00
Alexandre Riera 4aaa5b2687 refs #5020 isActive Not Null
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 09:08:09 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:00:20 +01:00
Pau eb4ad206d0 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 06:20:14 +00:00
Alexandre Riera 5473b2ca2e Merge pull request 'fixes #4930 Añadir Zona en la info del cliente, en las reclamaciones' (!1226) from 4930-add-zone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1226
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-17 12:01:35 +00:00
Joan Sanchez 1597c40a16 Merge branch 'dev' into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 11:33:56 +00:00
Pau f0cc28d698 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:46:55 +00:00
Alex Moreno 1f042d01ba Merge pull request 'fixes #4523 item_fixed-price_rate2' (!1218) from 4523-item_fixed-price_rate2 into dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:45:28 +00:00
Alex Moreno bc9510a317 Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:46:16 +00:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Pau ffad1a6d79 eliminadas las comillas de template
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:35:19 +01:00
Pau f7a25c64b5 format sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:13:41 +01:00
Alexandre Riera 77eb9c8013 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:10:23 +01:00
Pau ba1e46f8d7 Merge pull request 'closes #4605 Create-Model-PackagingMistake' (!1247) from 4605-Create-Model-PackagingMistake into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1247
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-17 09:05:19 +00:00
Alexandre Riera 4e1c43eb4d refs #4945 nombre temporal removed
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:01:49 +01:00
Pau 3a1aea2afd Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:01:45 +00:00
Alexandre Riera c371c2fe92 refs #4930 refresh structure
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:03:13 +01:00
Alexandre Riera e97a02a871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:02:27 +01:00