Commit Graph

15167 Commits

Author SHA1 Message Date
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
Alexandre Riera 6590c6f1fa refs #5036 transferSales also transfer sale's logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:55:04 +01: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
Carlos Andrés ffdfd1a7e5 refs #5000 Invoicing change structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 14:48:21 +01:00
Vicent Llopis 9b11987d75 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 14:33:38 +01:00
Vicent Llopis 475bc2c255 feat: solo puede dar conforme/no confome el propio usuario 2023-02-23 14:33:16 +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
Vicent Llopis 9310e92223 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:44:08 +01:00
Carlos Andrés 7f60335a91 refs #5000 Invoicing: front tests refactor & fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:45:15 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Carlos Andrés 01ade6eb03 refs #5000 Merge with dev 2023-02-23 09:23:06 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Vicent Llopis 35b47c6da2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 08:21:59 +01: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
Vicent Llopis 05d91ed50e feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 15:12:25 +01: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
Vicent Llopis a93fb2c69f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 14:29:29 +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
Alexandre Riera be8d19a9f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 09:27:38 +01:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +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 1c1e4cc176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 13:37:53 +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
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:56:46 +01:00
Joan Sanchez f88c9b904c Updated fixtures 2023-02-21 10:38:23 +01:00
Joan Sanchez 58548164d2 Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 09:20:30 +00:00
Alex Moreno bcfa762038 typo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:17:25 +01:00
Joan Sanchez c5c76984ff Merge pull request 'fix(image): store images with a name generated through uuid instead of url path' (!1337) from 5266-image_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1337
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-02-21 08:56:19 +00:00
Joan Sanchez 4c2878e232 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 09:48:47 +01:00
Joan Sanchez 45c4f2ff45 Updated test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 08:51:50 +01:00
Joan Sanchez c9840f6985 Updated entry structure 2023-02-21 08:32:46 +01:00
Joan Sanchez 94acd80531 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export 2023-02-21 08:23:14 +01:00
Joan Sanchez a04c8ed8d8 Updated structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 08:17:52 +01:00
Joan Sanchez 0a7b3647b8 Updated fixtures 2023-02-21 07:57:35 +01:00