Commit Graph

14250 Commits

Author SHA1 Message Date
Alex Moreno c990b9a564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:37:24 +01:00
Vicent Llopis e3504da800 Merge pull request 'fix: test e2e' (!1276) from fix_e2e_item.tags into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1276
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-30 13:36:08 +00:00
Vicent Llopis e0dcbb6f2b fix backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 14:32:39 +01:00
Vicent Llopis a1e86f2bd6 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:28:50 +00:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Joan Sanchez 8969882793 Removed where property dependency
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:13:38 +01:00
Vicent Llopis 0d044b3a73 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:51:10 +00:00
Pau 87d4964438 Merge pull request 'closes #5146 decimals on supplier agency term' (!1279) from 5146-supplier.agency.term-decimal into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1279
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-30 11:49:09 +00:00
Vicent Llopis ce96249389 falla primer test de back
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 12:38:23 +01:00
Pau 1404a276a0 Merge branch 'dev' into 5146-supplier.agency.term-decimal
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:34:39 +00:00
Vicent Llopis c13f0109be Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 11:22:16 +00:00
Alexandre Riera 39835069f9 Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1280) from 5088-quitar-texto-clientBalance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1280
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-30 11:13:27 +00:00
Alexandre Riera 46ee12de6d refs #5088 text deleted
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 09:45:10 +01:00
Pau cf64de39f9 refs #5146 @1h add step to vn-inputs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 09:01:20 +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
Vicent Llopis 79bf1739ba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 13:52:14 +01:00
Vicent Llopis 29c6ca35ff fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 13:39:19 +01:00
Vicent Llopis ce1bdaec17 Merge pull request '4925-item.tags' (!1241) from 4925-item.tags into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1241
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-01-27 08:16:00 +00:00
Alex Moreno 7d9e7d93e5 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:12:32 +00:00
Vicent Llopis 2c9445293a Merge pull request '4860-route.index_downloadZip' (!1259) from 4860-route.index_downloadZip into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1259
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-27 08:12:04 +00:00
Vicent Llopis 7bcddf73c6 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:07:19 +00:00
Vicent Llopis eb00d98885 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:01:25 +00:00
Alexandre Riera daf3d4b52f Merge pull request 'fixes #5141 Añadir Provincia del consignatario en Claim/Descriptor' (!1270) from 5141-provincia-consignatario into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1270
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-27 08:00:49 +00:00
Alexandre Riera de9098da24 Merge branch 'dev' into 5141-provincia-consignatario
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 07:43:29 +00:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Alexandre Riera b89a384671 Merge pull request 'fixes #4564 que reports maneje si el origen de datos no devuelve registros' (!1266) from 4564-report_eror-handler into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1266
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-01-27 06:46:40 +00:00
Alexandre Riera dc528722bd Merge branch 'dev' into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 06:34:41 +00:00
Vicent Llopis 17b3e8c396 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:36:50 +00:00
Alexandre Riera 25f0c0d9e3 refs #5141 province added
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 14:16:30 +01:00
Joan Sanchez 3ed04211fd Updated package version
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 13:05:12 +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
Alex Moreno d77730dd47 fix: mockedDate in e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 10:10:25 +01:00
Alex Moreno eb59efbb85 refactor(front): use vn-loopback/boot/date
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 15:12:16 +01:00
Alex Moreno 1f52d04d4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-24 15:01:26 +01:00
Joan Sanchez 2676e09b2b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 12:34:00 +01:00
Alexandre Riera 1936680f49 Merge pull request 'hotfix itemName' (!1268) from hotfix-itemName into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1268
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-24 11:29:12 +00:00
Alexandre Riera ca7154bff1 hotfix itemName
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 12:16:10 +01:00
Vicent Llopis 5ccee0c5e9 Merge pull request 'TEST_2952-ticket.sale-tracking' (!1262) from TEST_2952-ticket.sale-tracking into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1262
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-24 09:36:02 +00:00
Joan Sanchez 869cd39df3 Merge branch 'test' into TEST_2952-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 08:57:26 +00:00
Vicent Llopis ec5e2a21f7 feat: añadido icono carro
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 08:09:35 +01:00
Vicent Llopis 084a3f0398 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:05:18 +01:00
Vicent Llopis 092501f0ef actualizado changelof
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 21:29:48 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +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 765e4ed332 refs #4564 all reports refactored
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:15:30 +01:00
Alex Moreno 78d33e2cd9 Merge pull request 'fix: typo' (!1265) from reset-password-typo into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 12:12:10 +00: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
Alexandre Riera 6e5728eead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 10:11:07 +01:00
Alex Moreno 6b6f27c2f2 fix: typo
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 08:44:58 +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