Commit Graph

17797 Commits

Author SHA1 Message Date
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +01:00
Alex Moreno 4a1c97c6b2 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:00:12 +00:00
Alexandre Riera 5d0ac58850 Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1296) from 5088-clientBalance-ponerReceiptId into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1296
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 06:26:50 +00:00
Guillermo Bonet d30f471bc5 Merge pull request 'refs #4975 Added chat/send in mdbVersion/upload' (!1295) from 4975-mdbConfig-and-upload into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1295
2023-02-01 06:21:03 +00:00
Alex Moreno ae6e0f0772 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:20:48 +00:00
Alexandre Riera a52be50dad Merge branch 'dev' into 5088-clientBalance-ponerReceiptId
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:18:41 +00:00
Alexandre Riera 17bb4b6072 refs #5088 added receiptId
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:17:16 +01:00
Alexandre Riera d046cd69a9 Merge pull request 'fixes #5129 Enriquecer mensaje si no se pueden editar ticket.sale' (!1287) from 5129-enriquecer-mensaje into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1287
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-01 06:13:15 +00:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Guillermo Bonet 909f0c3532 Merge branch 'master' into 4975-mdbConfig-and-upload
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:09:44 +00:00
Alexandre Riera fd440a4db3 refs #5129 better translation tracked sales
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:42:36 +01:00
Alexandre Riera 11a605ea04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 15:40:54 +01:00
Alexandre Riera c6f87f9084 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:39:03 +01:00
Alexandre Riera a3da71996a refs #5131 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:36:51 +01:00
Alexandre Riera 349829e5ed refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Guillermo Bonet 18168b07bb refs #4975 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:47:24 +01:00
Pau 5c0354bc17 add method to check if the ticket has refunds
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:26:57 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:23:40 +01:00
Alexandre Riera 955ca91073 Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:20:45 +00:00
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Juan Ferrer ac9374f54b Merge pull request '#5175 TpvTransaction.confirm(): Return response' (!1294) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1294
2023-01-31 13:07:10 +00:00
Juan Ferrer 5045a8f670 #5175 TpvTransaction.confirm(): Return response
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:00:10 +01:00
Alexandre Riera 5e9cf65c1b Merge pull request 'fixes #5104 Convertir todos los precios a precio grouping/packing' (!1286) from 5104-convert-prices into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1286
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-31 12:58:20 +00:00
Guillermo Bonet e12f183968 refs #4975 Added chat/send in mdbVersion/upload
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:46:42 +01:00
Juan Ferrer 63ff651448 Merge pull request 'master' (!1293) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1293
2023-01-31 12:46:42 +00:00
Juan Ferrer b1af981c74 Merge pull request 'refs #5174 TpvTransaction: Methods start & end added, fixes & refactor' (!1292) from 5174-webPaymentsMigration into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1292
2023-01-31 12:32:29 +00:00
Juan Ferrer 5a4ae7d742 refs #5174 TpvTransaction: Methods start & end added, fixes & refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:29:17 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Pau 4c4f39282e Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:13:14 +00:00
Alexandre Riera d218fb9245 Merge branch '5129-enriquecer-mensaje' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 12:12:28 +01:00
Alexandre Riera a358e58171 docuware translation 2023-01-31 12:12:25 +01:00
Alexandre Riera b6f09b3262 Merge branch 'dev' into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:09:45 +00:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:57:56 +00:00
Alexandre Riera 906f80da5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:56:41 +01:00
Pau 397a7e2705 Merge pull request 'closes #5148 change style to pre-line' (!1285) from 5148-logs-style into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1285
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-31 10:46:26 +00:00
Alexandre Riera 9d0891e080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:49 +01:00
Alexandre Riera c121f184b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:26 +01:00
Pau 136ad332b9 Merge branch 'dev' into 5148-logs-style
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:36:17 +00:00
Alexandre Riera 1b12770655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:31:01 +01:00
Alexandre Riera ffdc539851 refs #5138 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:29:07 +01:00
Alex Moreno 292898708b result not null
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:24:09 +01:00
Alex Moreno 320ceb3e2c fix: getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:17:31 +01:00
Alexandre Riera ca967a7223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:15:46 +01:00
Alex Moreno 3f1020aebf Merge pull request 'fix: e2e' (!1289) from fix_e2e_state_and_date into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1289
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-31 10:14:21 +00:00
Pau ee10146e0f Merge branch 'dev' into 5148-logs-style
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:09:32 +00:00
Alex Moreno 62cd6ab0c9 Merge branch 'dev' into fix_e2e_state_and_date
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 09:39:08 +00:00