Commit Graph

14804 Commits

Author SHA1 Message Date
Alexandre Riera 3dd6232d6a hotfix isTrucker was not in the params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:39:01 +01:00
Guillermo Bonet 656685cd7e refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 14:35:34 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera 85b1ca4a02 Merge pull request 'fixes #5287 Añadir campo Locker (Taquilla) en Worker/Basic Data y crear nueva sección Worker/PDA' (!1347) from 5287-worker-locker-pda into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1347
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-28 12:55:35 +00:00
Juan Ferrer 9336d20e45 refs #4975 MdbVersion/upload fixes & code clean
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:45:36 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:42:18 +01:00
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 12:46:48 +01:00
Alexandre Riera 5ccfe6bf90 refs #5160 callback added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 11:19:41 +01:00
Alexandre Riera 96e103d76e refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:37:17 +01:00
Alexandre Riera 7a04b0b3de refs #5287 icon added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:00:18 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Alexandre Riera 5b7306a9ca refs #5287 f describe
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:41:27 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:39:46 +01:00
Joan Sanchez 1bc715cde5 Updated claim state field
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 14:32:56 +01:00
Alexandre Riera 335f259eba Merge pull request 'fixes #5172 Mostrar Impagado en el descriptor de Client' (!1323) from 5172-cliente-impagado into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1323
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-24 09:40:59 +00:00
Alexandre Riera 698a3396fc refs #5063 deleted changes in item hook
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 10:40:24 +01:00
Alexandre Riera 9da3593dff Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 10:37:38 +01:00
Alexandre Riera 6d6fa11da1 refs #5063 fixed front test 2023-02-24 10:37:35 +01:00
Alexandre Riera 113b37e56f Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 09:25:44 +00:00
Alexandre Riera afb14044cc refs #5063 deleted item checked in image, added front test
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 10:25:08 +01:00
Alexandre Riera ed7f3f5d63 Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:34:41 +00:00
Alexandre Riera e7e7fef285 Merge pull request 'fixes #5168 Mostrar instance-log en Ticket/Sale solo cuando haya registros' (!1341) from 5168-mostrar-instanceLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1341
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-24 08:34:16 +00:00
Alexandre Riera 6a65c9f0e2 Merge branch 'dev' into 5168-mostrar-instanceLog
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:22:45 +00:00
Alex Moreno 36651aa423 Merge pull request '4998-claim_photos_back' (!1343) from 4998-claim_photos_back into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1343
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-24 08:15:35 +00:00
Alexandre Riera 4682497df9 Merge branch 'dev' into 5168-mostrar-instanceLog
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:08:20 +00:00
Alex Moreno bd225e6824 Merge branch 'dev' into 4998-claim_photos_back
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 07:59:28 +00:00
Joan Sanchez 788e5488ae Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 07:58:26 +00:00
Joan Sanchez fafbfed189 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 07:23:38 +01:00
Alexandre Riera afef2e4d63 Merge pull request 'hotfix Balance crear pago' (!1345) from hotfix-balance-crearPago into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1345
2023-02-24 06:04:00 +00:00
Alexandre Riera bca9e757d4 hotfix parsed description array to string
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 15:52:47 +01:00
Robert Ferrús 1e23dfe34e Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:00:32 +00:00
Alexandre Riera 4de49a9155 Merge pull request 'fixes #5235 Error mensaje: Cambios sin guardar' (!1342) from 5235-cambios-sin-guardar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1342
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-23 06:45:58 +00:00
Alex Moreno 8597497429 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 14:31:31 +01:00
Alexandre Riera 3a3dcc941b Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 14:24:33 +01:00
Alexandre Riera 0263a4833e refs #5172 added changelog 2023-02-22 14:24:31 +01:00
Alexandre Riera ca1f5480ae refs #5235 added setClientSample(), fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 13:04:27 +01:00
Alexandre Riera b9b2a40199 refs #5168 fixed e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 12:52:54 +01:00
Alexandre Riera 42b8f08a4d refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 12:14:17 +01:00
Joan Sanchez 0997f8cd27 Merge pull request 'feat: add console.log' (!1340) from post_add_consoleLog into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1340
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-21 13:58:10 +00:00
Joan Sanchez ce68301885 Merge pull request 'Imported production database' (!1338) from 5192-db_export into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-21 13:53:36 +00:00
Alex Moreno f0827c992b feat: add console.log
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 14:53:35 +01:00
Joan Sanchez 3d8add4d6f Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 13:12:27 +00:00
Joan Sanchez 3177573c4d Removed invalid dash character
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 14:12:06 +01:00
Joan Sanchez 0d16f71fd3 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-02-21 14:10:36 +01:00
Joan Sanchez 71167ffa1f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 14:02:25 +01:00
Joan Sanchez 49c2ec7f9a fix(image): Enabled failOn option
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-21 14:01:12 +01:00
Vicent Llopis a6dbc64ef6 Merge pull request 'hotfix_item.getVisible&Available' (!1339) from hotfix_item.getVisible&Available into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1339
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-21 12:04:27 +00:00
Vicent Llopis c30242f9cc fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 12:17:16 +01:00
Joan Sanchez 65a251ab03 Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 11:59:53 +01:00
Vicent Llopis eda70b009b fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 11:48:56 +01:00