Commit Graph

15052 Commits

Author SHA1 Message Date
Vicent Llopis a68fef8a5b feat: test front 2023-03-08 09:51:09 +01:00
Vicent Llopis 78721e7ffa feat: add fixtures 2023-03-08 09:50:47 +01:00
Carlos Satorres 3d1f640e08 refs #5380 m3Max add and mod itemMaxSize 2023-03-08 09:19:57 +01:00
Alexandre Riera 741dd921d2 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-03-08 07:48:11 +01:00
Joan Sanchez c93d3f8846 Updated front unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 07:47:25 +01:00
Javi Gallego bb691ccf1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
2023-03-08 07:45:25 +01:00
Javi Gallego 98c8cd67e5 minor bug 2023-03-08 07:45:22 +01:00
Joan Sanchez 9050c06994 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 07:44:56 +01:00
Alexandre Riera 0fbff4eb8f Merge branch '5036-regularizar-historicos' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 14:11:05 +01:00
Alexandre Riera b00a481016 refs #5036 hasGrabUser out of function 2023-03-07 14:11:03 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled
gitea/salix/pipeline/head Build queued... Details
2023-03-07 13:10:02 +01:00
Joan Sanchez 3ad96b6ad7 Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 11:55:13 +01:00
Joan Sanchez 445a0b0e1f Claim fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 10:20:10 +01:00
Vicent Llopis b6e993dadf fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 10:04:26 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-03-07 08:28:13 +00:00
Vicent Llopis 0bda8c0ed6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 09:14:30 +01:00
Javi Gallego 0a44a39d28 Merge pull request '5187-error-permisos' (!1366) from 5187-error-permisos into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1366
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-07 07:50:26 +00:00
Javi Gallego a856b20dc9 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:20:21 +00:00
Joan Sanchez 0c36c737e2 Merge pull request '5177-smart_check_fix' (!1371) from 5177-smart_check_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1371
2023-03-07 07:16:26 +00:00
Joan Sanchez 14a5c78303 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:13:07 +01:00
Vicent Llopis 4830f8489a remove unnecessary fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:12:08 +01:00
Joan Sanchez 0d2339686c Updated changelog
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 08:10:52 +01:00
Joan Sanchez e8e8392e5d Updated changelog 2023-03-07 07:58:08 +01:00
Joan Sanchez c0ff6bea57 fix(smartTable): fixed filtering with an intermediate check
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: #5177
2023-03-07 07:47:30 +01:00
Javi Gallego 4a32c164a6 template string
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:34:08 +01:00
Vicent Llopis dcad679aa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:06:51 +01:00
Joan Sanchez bc0a6c33c4 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 13:50:21 +00:00
Joan Sanchez 9f4aed7d83 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 13:44:03 +01:00
Vicent Llopis a98bb59479 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 12:47:49 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
gitea/salix/pipeline/head This commit looks good Details
Refs: #5340
2023-03-06 12:37:37 +01:00
Alexandre Riera 6e984d8527 Merge pull request 'refactor tests ticketFutureAdvance' (!1369) from refactor-e2e-ticketFutureAdvance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1369
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-06 11:17:14 +00:00
Alexandre Riera 7f076109f5 Merge branch 'dev' into refactor-e2e-ticketFutureAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 11:05:00 +00:00
Alexandre Riera a6bf61033f refactor tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 12:04:16 +01:00
Vicent Llopis 9e9807c4b5 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-03-06 11:55:30 +01:00
Vicent Llopis e39690c2c9 merge with dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 10:21:10 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Vicent Llopis 0f021c5183 Merge pull request '5035-intermittent_backTest2' (!1365) from 5035-intermittent_backTest2 into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1365
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-06 08:32:14 +00:00
Juan Ferrer 47f1ad9a0c Merge pull request 'master' (!1367) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1367
2023-03-06 08:28:29 +00:00
Juan Ferrer e83b518470 refs #3723 Set docker memory limit
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:23:24 +01:00
Javi Gallego 780572a9f2 test fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 08:14:26 +01:00
Juan Ferrer 99f8bc6bac refs #5174 TpvTransaction.confirm code refator to improve debugging
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 18:55:58 +01:00
Vicent Llopis 497d756af6 fix: autocompletar el switf/bic
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 13:46:18 +01:00
Vicent Llopis 727ae1d4e0 Merge branch 'dev' into 5035-intermittent_backTest2
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 12:11:28 +00:00
Joan Sanchez 5984d6820b Merge pull request '5349-hotfix_report_invoice' (!1364) from 5349-hotfix_report_invoice into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1364
2023-03-03 11:43:28 +00:00
Vicent Llopis 8ac575419a fix: no mostraba la factura rectificada correcta
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 12:31:20 +01:00
Juan Ferrer 73c988b18e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 10:57:59 +01:00
Juan Ferrer 6eaf4bdd1b refs #5174 tpvTransaction: Añadidas columnas para depuración 2023-03-03 10:57:57 +01:00
Alexandre Riera f9f58c28d5 Merge pull request 'hotfix itemWaste' (!1363) from hotfix-itemWaste-openOtherTab into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1363
2023-03-03 09:01:30 +00:00
Alexandre Riera de0e7334df Merge branch 'master' into hotfix-itemWaste-openOtherTab
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 07:55:28 +00:00