 Joan Sanchez
|
9bc86b1617
|
Added missing relation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-10 13:29:11 +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 |
 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
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
 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 |
|
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 |
|
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
|
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 |
|
Alexandre Riera
|
d58a5eb1ff
|
hotfix itemWaste
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-03 08:54:55 +01:00 |
|
Vicent Llopis
|
7c24b940b3
|
feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 14:55:18 +01:00 |
|
Javi Gallego
|
e01fa40531
|
Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 11:51:41 +01:00 |
|
Joan Sanchez
|
b8881a050c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-02 07:41:16 +01:00 |
|
Joan Sanchez
|
ee6d292d6a
|
Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
Reviewed-on: #1264
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:34:45 +00:00 |
|
Joan Sanchez
|
8834d4d0a4
|
Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev
Reviewed-on: #1282
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:33:03 +00:00 |
|
Joan Sanchez
|
baedb5b6ca
|
Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev
Reviewed-on: #1354
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:31:39 +00:00 |
|
Joan Sanchez
|
32b3284e40
|
Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1344
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:31:20 +00:00 |
|
Joan Sanchez
|
84dc95621d
|
Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:30:17 +00:00 |
|
Joan Sanchez
|
d819a13597
|
Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1353
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-02 06:28:01 +00:00 |
|
Vicent Llopis
|
3051768781
|
WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:50:23 +01:00 |
|
Alexandre Riera
|
d62fbab3f1
|
refs #5070 refactor and added tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:22:25 +01:00 |
|
Vicent Llopis
|
bc542d8a40
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:11:12 +01:00 |
 Guillermo Bonet
|
707ae232a7
|
refs #5193 ticketCreateWithUser to ticket_add
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 12:24:36 +01:00 |
|
Alexandre Riera
|
cd026d79c3
|
Merge branch 'master' into hotFix-itemDiary-reloadCardConditional
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 11:22:41 +00:00 |
|
Alexandre Riera
|
d744cbb1a3
|
hotFix itemDiary reload card conditional
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 12:22:01 +01:00 |
|
Vicent Llopis
|
2f9e9ada43
|
Merge branch 'dev' into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 10:58:49 +00:00 |
|
Alexandre Riera
|
48da6403fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-01 11:20:24 +01:00 |
|
Carlos Andrés
|
6f5e25493d
|
invoicing test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-01 10:36:38 +01:00 |
|
Alexandre Riera
|
7aedbda98b
|
refs #5202 changed vn-tr for a
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 10:08:51 +01:00 |
|
Vicent Llopis
|
4567981724
|
add console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 09:09:09 +01:00 |
|
Alexandre Riera
|
915c598c0c
|
fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 09:04:53 +01:00 |
|
Vicent Llopis
|
f6afed485c
|
add console.log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-01 08:50:30 +01:00 |
|
Vicent Llopis
|
07784ffbfa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest2
|
2023-03-01 08:46:26 +01:00 |
|
Alexandre Riera
|
2e09845dbd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued...
Details
|
2023-03-01 08:29:58 +01:00 |
|
Vicent Llopis
|
8a1a7d7159
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 08:20:28 +01:00 |
|
Vicent Llopis
|
da6e29056e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 08:08:23 +01:00 |
|
Alexandre Riera
|
4d6a770b26
|
Merge branch 'master' into hotfix-supplier-isTrucker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 13:39:45 +00:00 |
|
Alexandre Riera
|
3dd6232d6a
|
hotfix isTrucker was not in the params
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-28 14:39:01 +01:00 |
|
Guillermo Bonet
|
656685cd7e
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 14:35:34 +01:00 |
|
Alexandre Riera
|
b2bf7f2727
|
refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-28 14:29:31 +01:00 |
|
Juan Ferrer
|
9336d20e45
|
refs #4975 MdbVersion/upload fixes & code clean
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 13:45:36 +01:00 |
|
Alexandre Riera
|
e9dca9211c
|
refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 13:42:18 +01:00 |
|
Alexandre Riera
|
d5ea59e284
|
refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 12:46:48 +01:00 |
|
Alexandre Riera
|
96e103d76e
|
refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 08:37:17 +01:00 |
|
Alexandre Riera
|
7a04b0b3de
|
refs #5287 icon added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 08:00:18 +01:00 |
|
Alexandre Riera
|
94901d5b1f
|
refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-28 07:49:34 +01:00 |
|
Alexandre Riera
|
5d9220c5c0
|
refs #5287 locker added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 08:39:46 +01:00 |
|
Alexandre Riera
|
76cd2d160e
|
Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 06:05:21 +00:00 |
|
Alexandre Riera
|
2a4d41cbca
|
refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-24 14:41:02 +01:00 |
|
Joan Sanchez
|
1bc715cde5
|
Updated claim state field
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 14:32:56 +01:00 |
|
Alexandre Riera
|
698a3396fc
|
refs #5063 deleted changes in item hook
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 10:40:24 +01:00 |