Commit Graph

15169 Commits

Author SHA1 Message Date
Joan Sanchez d9f4227ffa Merge pull request 'refs #5368 Fix expedition-pallet-label' (!1378) from 5368-fix-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1378
2023-03-13 09:38:01 +00:00
Joan Sanchez b58135f611 Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1379
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-13 09:37:42 +00:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:22:36 +00:00
Joan Sanchez 60c137b280 Merge branch 'dev' into 5368-fix-expedition-pallet-label
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:19:39 +00:00
Alexandre Riera 0248c3c9e0 refs #5056 models and tables added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 07:34:49 +01:00
Alexandre Riera eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 06:10:51 +00:00
Joan Sanchez 1b984f4325 Event callback
gitea/salix/pipeline/head This commit looks good Details
2023-03-12 20:51:22 +01:00
Vicent Llopis 5cb28036c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 14:25:55 +01:00
Joan Sanchez 9bc86b1617 Added missing relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 13:29:11 +01:00
Vicent Llopis 1ef454681c fix: faltaba this delante de formateDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:51:25 +01:00
Alexandre Riera efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 11:50:11 +00:00
Alexandre Riera c4d6a19666 refs #5092 download as csv button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:49:20 +01:00
Alexandre Riera 874fd0656c refs #5206 url gets params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:05:16 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Alexandre Riera e66974f77f refs #5036 removed grabUserLog function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:02:34 +01:00
Pablo Natek 63ccb26bf3 refs #5151
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 08:17:10 +01:00
Vicent Llopis 19fcf5d536 feat: add column 'description'
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 07:46:36 +01:00
Vicent Llopis b24b6d4121 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback 2023-03-10 07:46:16 +01:00
Pablo Natek 901a8ab112 refs #5151 botones
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 14:34:06 +01:00
Carlos Satorres 5a0b567908 Merge branch 'dev' into 5380-m3/itemMaxSize
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 13:29:06 +00:00
Carlos Satorres 08254e28bb refs #5380 mod label max m3
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 14:24:00 +01:00
Vicent Llopis c105316a04 delete testBack
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 10:05:24 +01:00
Joan Sanchez 79428755db Merge pull request 'hotfix clientUnpaid' (!1381) from hotfix-clientUnpaid into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1381
2023-03-09 08:45:21 +00:00
Vicent Llopis 9094c4f1cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:42:08 +01:00
Vicent Llopis 223b8f6d00 fix: intermittentBack test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:41:51 +01:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:29:43 +00:00
Alexandre Riera a5f6d37f0f hotfix reload card, improved icon message 2023-03-09 09:29:11 +01:00
Joan Sanchez 76f5b3def3 Merge pull request 'hotfix clientUnpaid' (!1380) from hotfix-clientUnpaid into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1380
2023-03-09 08:06:29 +00:00
Joan Sanchez 24f0ca5168 Merge pull request '5240-ticket.sale-tracking_2' (!1376) from 5240-ticket.sale-tracking_2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1376
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-09 08:05:48 +00:00
Alexandre Riera 2363828092 hotfix clientUnpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:54:03 +01:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 08:31:38 +01:00
Vicent Llopis b85624085a fix backTest: add columns to table tpvTransaction
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:24:21 +01:00
Vicent Llopis c46d325e23 fix: add transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 07:58:39 +01:00
Alexandre Riera 9ff920c67e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 06:50:33 +00:00
Guillermo Bonet 0c22c1b0de refs #5368 Fix expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 17:30:28 +01:00
Carlos Satorres 7426c97479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5380-m3/itemMaxSize 2023-03-08 15:11:55 +01:00
Vicent Llopis e20464cc7c update css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:14:06 +01:00
Carlos Satorres 6d7874d3ab refs #5380 JSON modificado HTML arreglado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:12:21 +01:00
Carlos Andrés 32429a58e0 refs #5000 remove consolelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 12:36:53 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Vicent Llopis 165dc73b33 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-08 12:22:29 +01:00
Vicent Llopis 07edacd557 fix: frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:14 +01:00
Vicent Llopis 79023fbfaf feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:16:53 +01:00
Alexandre Riera 88cde4b8a1 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:13:56 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Vicent Llopis f461c75af1 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:06:31 +01:00
Vicent Llopis 776f7783c6 refactor code 2023-03-08 12:06:20 +01:00
Vicent Llopis 0396d3707c refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:47:10 +01:00
Alexandre Riera b1d5a2ba1a Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 10:46:16 +00:00
Alexandre Riera 9dd242908e .
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 11:43:47 +01:00