Commit Graph

18582 Commits

Author SHA1 Message Date
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
Carlos Satorres a48c67aab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-03-09 14:09:37 +01:00
Carlos Satorres 73ca811fc0 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:03:37 +00:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +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
Alexandre Riera 106f96b9a6 refs #4713 fixed front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:10:08 +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
Alexandre Riera ed6edfed45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:50:29 +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
Joan Sanchez c3cf3f3d91 Merge pull request '5090-renameGoLabel' (!1362) from 5090-renameGoLabel into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1362
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-08 09:52:53 +00:00
Joan Sanchez 63694f4478 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:47:47 +00:00
Joan Sanchez 4d2d75e066 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-03-08 10:19:11 +01:00
Joan Sanchez aeb50b2c19 Removed callback syntax
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 10:19:02 +01:00
Joan Sanchez 56d3b32af5 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 09:12:53 +00:00
Vicent Llopis 760690a625 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:51:21 +01:00
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
Carlos Satorres 8499ae5243 Merge branch 'dev' into 5284-fueraPlazo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 07:14:42 +00:00
Joan Sanchez 23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 06:50:16 +00: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