 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 |
 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 |
|
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 |
 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 |
|
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 |
|
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 |
|
Carlos Satorres
|
955e55a7f4
|
refs #5284 new onCreateClaimAccepted y createClaim
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-07 15:43:48 +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 |
|
Alexandre Riera
|
b828d40464
|
Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-06 09:13:05 +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 |
|
Alexandre Riera
|
f2bd0253e2
|
refs #5092 added unbilled tickets section
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-06 09:27:53 +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 |
|
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 |
|
Joan Sanchez
|
37043beb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-03 07:44:31 +01:00 |
|
Alexandre Riera
|
ed5208c9e4
|
refs #5206 implemented general search, missing tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 15:10:17 +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 |
|
Alexandre Riera
|
dbe42e3bf4
|
refs #5206 version with plane added, needs to implement general search
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 13:55:47 +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 |
|
Alexandre Riera
|
be1993cf8b
|
refs #5206 version with top-searcher and two fields for reference and id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-02 11:33:55 +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 |
|
Alexandre Riera
|
9da3593dff
|
Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 10:37:38 +01:00 |
|
Alexandre Riera
|
6d6fa11da1
|
refs #5063 fixed front test
|
2023-02-24 10:37:35 +01:00 |
|
Alexandre Riera
|
113b37e56f
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 09:25:44 +00:00 |
|
Alexandre Riera
|
afb14044cc
|
refs #5063 deleted item checked in image, added front test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 10:25:08 +01:00 |
|
Alexandre Riera
|
ed7f3f5d63
|
Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 08:34:41 +00:00 |
|
Alexandre Riera
|
6a65c9f0e2
|
Merge branch 'dev' into 5168-mostrar-instanceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 08:22:45 +00:00 |
|
Alexandre Riera
|
4682497df9
|
Merge branch 'dev' into 5168-mostrar-instanceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 08:08:20 +00:00 |
 Alex Moreno
|
bd225e6824
|
Merge branch 'dev' into 4998-claim_photos_back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 07:59:28 +00:00 |
|
Joan Sanchez
|
788e5488ae
|
Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 07:58:26 +00:00 |
|
Alexandre Riera
|
6590c6f1fa
|
refs #5036 transferSales also transfer sale's logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 08:55:04 +01:00 |
|
Joan Sanchez
|
fafbfed189
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-24 07:23:38 +01:00 |
|
Alexandre Riera
|
bca9e757d4
|
hotfix parsed description array to string
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 15:52:47 +01:00 |
|
Carlos Andrés
|
ffdfd1a7e5
|
refs #5000 Invoicing change structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-23 14:48:21 +01:00 |
|
Vicent Llopis
|
9b11987d75
|
feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 14:33:38 +01:00 |
|
Vicent Llopis
|
475bc2c255
|
feat: solo puede dar conforme/no confome el propio usuario
|
2023-02-23 14:33:16 +01:00 |
 Robert Ferrús
|
1e23dfe34e
|
Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 10:00:32 +00:00 |
|
Vicent Llopis
|
9310e92223
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 10:44:08 +01:00 |
|
Carlos Andrés
|
7f60335a91
|
refs #5000 Invoicing: front tests refactor & fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-23 09:45:15 +01:00 |
|
Carlos Andrés
|
4cc6485cbd
|
refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-23 09:25:23 +01:00 |
|
Carlos Andrés
|
eaa5b4530a
|
getMinClientId
|
2023-02-23 09:22:17 +01:00 |
|
Vicent Llopis
|
35b47c6da2
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-23 08:21:59 +01:00 |
|
Vicent Llopis
|
05d91ed50e
|
feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-22 15:12:25 +01:00 |
|
Alex Moreno
|
8597497429
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 14:31:31 +01:00 |
|
Vicent Llopis
|
a93fb2c69f
|
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-02-22 14:29:29 +01:00 |
|
Alexandre Riera
|
3a3dcc941b
|
Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-22 14:24:33 +01:00 |
|
Alexandre Riera
|
0263a4833e
|
refs #5172 added changelog
|
2023-02-22 14:24:31 +01:00 |
|
Alexandre Riera
|
ca1f5480ae
|
refs #5235 added setClientSample(), fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 13:04:27 +01:00 |
|
Alexandre Riera
|
42b8f08a4d
|
refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-22 12:14:17 +01:00 |
|
Alexandre Riera
|
be8d19a9f8
|
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-02-22 09:27:38 +01:00 |
|
Vicent Llopis
|
c8c48ea175
|
feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 15:16:28 +01:00 |
|
Joan Sanchez
|
3d8add4d6f
|
Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 13:12:27 +00:00 |
|
Joan Sanchez
|
0d16f71fd3
|
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-02-21 14:10:36 +01:00 |
|
Vicent Llopis
|
c30242f9cc
|
fix: front test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 12:17:16 +01:00 |
|
Vicent Llopis
|
eda70b009b
|
fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 11:48:56 +01:00 |
|
Vicent Llopis
|
432c8a9ab8
|
refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 10:56:46 +01:00 |
|
Joan Sanchez
|
58548164d2
|
Merge branch 'dev' into 5192-db_export
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 09:20:30 +00:00 |
|
Joan Sanchez
|
4c2878e232
|
Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 09:48:47 +01:00 |
|
Joan Sanchez
|
45c4f2ff45
|
Updated test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-21 08:51:50 +01:00 |
|
Joan Sanchez
|
c9840f6985
|
Updated entry structure
|
2023-02-21 08:32:46 +01:00 |
|
Alex Moreno
|
cc5a867bf4
|
feat(claim_model): add claimDms relations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-20 15:16:19 +01:00 |
|
Alexandre Riera
|
063c60b4a1
|
Merge branch 'dev' into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:58:31 +00:00 |
|
Joan Sanchez
|
ab6ca12862
|
Merge branch 'dev' into 5266-image_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:15:40 +00:00 |
|
Vicent Llopis
|
0b240e7925
|
add console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:35:50 +01:00 |
|
Alexandre Riera
|
271a6d898d
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 12:17:03 +00:00 |
|
Alexandre Riera
|
04877c1425
|
refs #5063 refactor hook
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 13:15:47 +01:00 |
|
Joan Sanchez
|
90e1136ee2
|
fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good
Details
Refs: #5266
|
2023-02-20 12:40:13 +01:00 |
|
Vicent Llopis
|
26d72a7b3f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund
|
2023-02-20 11:49:17 +01:00 |
|
Alexandre Riera
|
c7f22a10ba
|
refs #5063 refactored hook
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 10:39:12 +01:00 |
|
Alexandre Riera
|
5c2c99e397
|
refs #5172 changed icon name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-20 09:44:14 +01:00 |
|
Alexandre Riera
|
77066b2005
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
|
2023-02-20 09:20:30 +01:00 |
|
Alexandre Riera
|
08476fe2a6
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:30:47 +00:00 |
|
Joan Sanchez
|
86dd299292
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:33:52 +01:00 |
|
Joan Sanchez
|
ceab11cc41
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:33:34 +01:00 |
|
Vicent Llopis
|
39a3c8a7fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 13:06:30 +01:00 |
|
Vicent Llopis
|
853e06f523
|
fix: card reload automatic
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 12:38:07 +01:00 |
|
Joan Sanchez
|
527caf9ca0
|
refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good
Details
Refs: #5207
|
2023-02-17 11:19:35 +01:00 |
|
Vicent Llopis
|
373be40986
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
|
2023-02-17 10:42:50 +01:00 |
|
Vicent Llopis
|
4001a75916
|
Merge branch 'dev' into 5180-invoice-out_refund
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 08:57:48 +00:00 |
|
Vicent Llopis
|
874f459956
|
refactor: borrada variable innecesaria
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 09:49:47 +01:00 |
|
Vicent Llopis
|
885a98457e
|
feat: sustido sql por loopback del report 'balance-compensation'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 09:11:20 +01:00 |
|
Alexandre Riera
|
8b088e831a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-16 14:43:51 +01:00 |
|
Vicent Llopis
|
b5d2d53435
|
fix: test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 10:45:13 +01:00 |
|
Vicent Llopis
|
3096738b84
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-16 09:52:18 +01:00 |
|
Vicent Llopis
|
3dd870f7df
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 09:44:20 +01:00 |
|
Vicent Llopis
|
bb2eddc462
|
fix: test front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 07:32:44 +01:00 |
|
Vicent Llopis
|
73ae45c2c0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-15 15:08:58 +01:00 |
|
Alexandre Riera
|
dca5ae0f72
|
refs #5223 added params
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-15 13:14:52 +01:00 |
|
Vicent Llopis
|
443118a7ac
|
esto se debe BORRAR
gitea/salix/pipeline/head Build queued...
Details
|
2023-02-15 12:37:31 +01:00 |
|
Vicent Llopis
|
7439b12d98
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-15 09:31:20 +01:00 |
|
Vicent Llopis
|
df38f30f74
|
se incluyen los test intermintents que estaban incluidos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-15 09:10:55 +01:00 |
|
Alexandre Riera
|
ea2fd59cdc
|
refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 12:41:36 +01:00 |
|
Vicent Llopis
|
a5a0256e44
|
feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 10:58:41 +01:00 |
 Pau
|
6a732819ba
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 09:58:10 +00:00 |
|
Alexandre Riera
|
b1a6713a3d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 09:04:08 +01:00 |
|
Alexandre Riera
|
139dac0bc1
|
refs #4588 moved hook from entryObservation to entry
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-14 08:08:48 +01:00 |
|
Alexandre Riera
|
e5e86de8d2
|
Merge branch 'dev' into 5152-ticketBasicData-stepTwo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 07:07:12 +00:00 |
|
Alexandre Riera
|
f6ec6da1c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-13 13:48:12 +01:00 |
|
Alexandre Riera
|
bfc21a7c97
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 13:36:58 +01:00 |
|
Alexandre Riera
|
4c7aae95aa
|
refs #5172 added default icon
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 13:04:22 +01:00 |
|
Alexandre Riera
|
76ed4d2d4b
|
refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 10:16:28 +01:00 |
|
Vicent Llopis
|
4da8546bdf
|
Merge branch 'dev' into 2952-ticket.sale-tracking_part2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 07:14:28 +00:00 |
|
Alexandre Riera
|
a7e9e52ad4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-13 07:34:13 +01:00 |
|
Pau
|
294b4acbe2
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-13 06:03:21 +00:00 |
|
Alexandre Riera
|
6cb815faaf
|
.
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-10 10:13:41 +01:00 |
|
Alexandre Riera
|
4787de3df5
|
fixing merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-10 09:04:49 +01:00 |
|
Alexandre Riera
|
a468fb2c66
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued...
Details
|
2023-02-10 09:02:44 +01:00 |
|
Alexandre Riera
|
9dc07d88d6
|
fixing e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-10 08:56:30 +01:00 |
|
Alexandre Riera
|
194069c0c2
|
refs #5194 fixed stock, lines
|
2023-02-10 08:46:54 +01:00 |
|
Vicent Llopis
|
5b22096567
|
refactor: actuializada consulta par obtener los clientes a facturar. Excluido impresion pdfs de la transaccion
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-09 14:57:08 +01:00 |
|
Joan Sanchez
|
ebee9144b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 09:16:30 +01:00 |
|
Joan Sanchez
|
461799f137
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 08:56:30 +01:00 |
|
Vicent Llopis
|
222032aae7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
|
2023-02-09 08:38:08 +01:00 |
|
Alexandre Riera
|
725b7b9bce
|
Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 12:48:23 +00:00 |
|
Alexandre Riera
|
ef5b29d6f3
|
hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 13:47:35 +01:00 |
|
Alexandre Riera
|
4413c8828b
|
refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-08 10:54:21 +01:00 |
|
Vicent Llopis
|
b70311999d
|
refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 09:41:09 +01:00 |
|
Javi Gallego
|
4a562c3110
|
unificado todo a claimState isEditable
|
2023-02-07 15:40:03 +01:00 |
|
Pau
|
86e6672e49
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 13:39:36 +00:00 |
|
Vicent Llopis
|
cec7602e1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-07 13:44:53 +01:00 |
|
Vicent Llopis
|
6cb3930be0
|
feat: añadido icono info, que indica de que almacén se saca la información
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-07 13:40:39 +01:00 |
|
Alexandre Riera
|
9f2ff4e4b7
|
addFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 12:30:30 +01:00 |
|
Alexandre Riera
|
d3564209ba
|
findById
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-07 08:05:48 +01:00 |
|
Vicent Llopis
|
2e8aabab14
|
fix: type relation in models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:32:54 +01:00 |
|
Vicent Llopis
|
499c9fa706
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 14:03:38 +01:00 |
|
Vicent Llopis
|
a2f93e68b1
|
feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 13:57:04 +01:00 |
|
Vicent Llopis
|
4f76465246
|
fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 12:24:26 +01:00 |
|
Alexandre Riera
|
68b4d269ff
|
Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 09:18:13 +00:00 |
|
Alexandre Riera
|
3879dfc89b
|
Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 08:19:16 +01:00 |
|
Alexandre Riera
|
f2f8a4eb04
|
fix test
|
2023-02-06 08:19:13 +01:00 |
|
Alexandre Riera
|
2c946b38d4
|
Merge branch 'dev' into 5074-ticket-balance-null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 07:08:50 +00:00 |
|
Alexandre Riera
|
df3e818182
|
refs #5074 refactor this.receipt.description
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-06 08:07:50 +01:00 |
|
Alex Moreno
|
c11df75a82
|
Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 06:30:56 +00:00 |
|
Alexandre Riera
|
fd31547b22
|
Merge branch 'dev' into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-06 06:00:41 +00:00 |
|
Alexandre Riera
|
546b3f6c9b
|
refs #3291 lateral menu added, fixed tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 15:21:27 +01:00 |
|
Alex Moreno
|
2717c6420c
|
fix(invoiceIn_descriptor): supplier.email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 14:58:58 +01:00 |
|
Joan Sanchez
|
d773837740
|
Removed user model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 14:44:00 +01:00 |
|
Vicent Llopis
|
ba5616055b
|
feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 14:31:50 +01:00 |
|
Joan Sanchez
|
38f34adc9a
|
Merge pull request 'master → test' (!1305) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1305
|
2023-02-03 12:44:42 +00:00 |
|
Vicent Llopis
|
c32a627fe5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day
|
2023-02-03 13:23:42 +01:00 |
|
Guillermo Bonet
|
ca24de7ee5
|
refs #4975 Changed description
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 12:50:19 +01:00 |
|
Guillermo Bonet
|
dddeca0832
|
refs #4975 Added property dsName in mdbBranch tab
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 12:46:01 +01:00 |
|
Alexandre Riera
|
0c91f95762
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
|
2023-02-03 12:03:16 +01:00 |
|
Alexandre Riera
|
141ae7b11c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 11:56:09 +01:00 |
|
Alex Moreno
|
575784c870
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-03 10:03:59 +01:00 |
|
Juan Ferrer
|
f4fc597c2c
|
Merge pull request 'master to test' (!1302) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1302
|
2023-02-03 08:12:09 +00:00 |
|
Pau
|
6c8609e180
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 07:52:14 +00:00 |
|
Vicent Llopis
|
508bce73bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-03 08:41:35 +01:00 |
|
Pau
|
e3de54b811
|
changed styles on summary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 08:35:15 +01:00 |
|
Pau
|
199dd2ba8d
|
Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-03 06:09:38 +00:00 |
|
Alex Moreno
|
8a50c56284
|
fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 14:52:40 +01:00 |
|
Alex Moreno
|
6c772643a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-02 11:55:11 +01:00 |
|
Joan Sanchez
|
eded1ebf20
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 11:42:48 +01:00 |
|
Alexandre Riera
|
16a6167db0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 10:39:26 +01:00 |
|
Pau
|
cadd525380
|
Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:36:07 +00:00 |
|
Joan Sanchez
|
d45c0cb99a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:59:39 +01:00 |
|
Joan Sanchez
|
4477486f8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-02-02 08:58:44 +01:00 |
|
Alexandre Riera
|
5f656a894f
|
buscador
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:52:38 +01:00 |
|
Joan Sanchez
|
85bde58752
|
Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1230
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-02-02 07:47:38 +00:00 |
|
Alexandre Riera
|
780018e4df
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:40:49 +01:00 |
|
Alexandre Riera
|
52a3f77bc5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 08:39:28 +01:00 |
|
Alex Moreno
|
5b228c5e71
|
Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-02 07:35:34 +00:00 |
|
Joan Sanchez
|
7a700de5c2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:23:17 +01:00 |
|
Joan Sanchez
|
644d98ec1c
|
syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 07:32:38 +01:00 |
|
Alexandre Riera
|
547c7a336b
|
Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:52:17 +00:00 |
|
Pau
|
ec73b512fc
|
Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 09:26:25 +01:00 |
|
Alexandre Riera
|
73b7a1d761
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:52:53 +01:00 |
|
Alexandre Riera
|
62766706b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
|
2023-02-01 08:52:03 +01:00 |
|
Alexandre Riera
|
7d7e1a74da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:46:28 +01:00 |
|
Alexandre Riera
|
d17f9396ad
|
refs #3291 save button
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:43:13 +01:00 |
|
Alex Moreno
|
00ffc82f8d
|
use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-01 08:34:14 +01:00 |
|
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
|
ae6e0f0772
|
Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 06:20:48 +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
|
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
|
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
|
b70557ee86
|
refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 14:20:08 +01: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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Alex Moreno
|
4740cdbbb9
|
fix: e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 10:37:18 +01:00 |
|
Vicent Llopis
|
19120ef102
|
feat: el descriptor coge el warehouseFk dependiendo de la sección
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 09:28:28 +01:00 |
|
Alexandre Riera
|
7d617c0ac4
|
refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 09:04:45 +01:00 |
|
Juan Ferrer
|
82bc7307f0
|
#5174 Signature verification fixed & enabled
gitea/salix/pipeline/head Build queued...
Details
|
2023-01-31 00:41:36 +01:00 |
|
Juan Ferrer
|
424dcb954c
|
refs #5174 Hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 20:23:52 +01:00 |
|
Juan Ferrer
|
64d8ae1f49
|
refs #5174 Hotfix
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2023-01-30 20:22:52 +01:00 |
|
Juan Ferrer
|
339cdab3c4
|
refs #5174 Debug enabled
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 19:59:46 +01:00 |
|
Juan Ferrer
|
d6794cb4c8
|
#5174 Hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 19:51:01 +01:00 |
|
Juan Ferrer
|
b20194b6d0
|
#5174 Hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 17:45:36 +01:00 |
|
Juan Ferrer
|
5744759d53
|
refs #5122 Hotfix: Signature verification
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 17:33:15 +01:00 |
|
Alexandre Riera
|
444d2ae4c4
|
refs #5104 grouping/packing unified
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-30 15:28:47 +01:00 |