 Joan Sanchez
|
f53ebb7641
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:59:34 +02:00 |
 Carlos Satorres
|
af8603185c
|
refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 08:35:44 +02:00 |
 Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
|
Joan Sanchez
|
35f94c58b7
|
reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 13:04:40 +02:00 |
 Alexandre Riera
|
b9b52c6b1d
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 07:08:02 +00:00 |
|
Alexandre Riera
|
ac4772e44e
|
refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:46:29 +02:00 |
 Vicent Llopis
|
3790e3457f
|
refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 08:43:42 +02:00 |
|
Vicent Llopis
|
2a2d03e05a
|
refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-12 15:02:21 +02:00 |
|
Alexandre Riera
|
0666163ca0
|
refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 12:33:14 +02:00 |
 Pablo Natek
|
ccf26c5413
|
Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 11:56:33 +00:00 |
|
Vicent Llopis
|
ec03c6edfa
|
fix intermittent backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 10:23:33 +02:00 |
|
Alexandre Riera
|
161fc25c5b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 10:01:21 +02:00 |
|
Vicent Llopis
|
ba31613ac9
|
Merge branch 'dev' into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-06 09:58:07 +00:00 |
 David Domenech
|
44d4df9c21
|
Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 11:00:08 +00:00 |
|
Carlos Satorres
|
8741a9f913
|
Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-05 06:51:21 +00:00 |
|
Vicent Llopis
|
fb5969a120
|
refs #5275 add test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 08:43:47 +02:00 |
|
Carlos Satorres
|
77b91b77b2
|
refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 08:19:50 +02:00 |
|
Vicent Llopis
|
e97b5a9f80
|
refs #5275 fix backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 07:54:56 +02:00 |
|
Vicent Llopis
|
28a12d0706
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-05 07:36:53 +02:00 |
|
Joan Sanchez
|
c126c6044a
|
Updated format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 13:55:44 +02:00 |
|
Alexandre Riera
|
1a14c793cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-04 09:47:31 +02:00 |
|
Joan Sanchez
|
8b4c70e8ba
|
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-30 14:57:00 +02:00 |
|
Vicent Llopis
|
67689695e4
|
refs #5275 filtra por defecto por el this.vnConfig.warehouseFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 14:29:19 +02:00 |
|
Joan Sanchez
|
26bddef5e5
|
Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev
Reviewed-on: #1394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-03-30 05:19:50 +00:00 |
|
Vicent Llopis
|
3b615d9879
|
refs #5275 fix: actualiza correctamete los elementos del checkedDummy
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-29 09:11:40 +02:00 |
|
Vicent Llopis
|
c53c54b6cd
|
refs #5275 feat: modificar masivamente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-28 14:59:08 +02:00 |
|
Vicent Llopis
|
b4e04fcdad
|
refs #5275 feat: colorear fechas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-28 14:40:14 +02:00 |
|
Vicent Llopis
|
fb1b39da17
|
refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-28 10:30:02 +02:00 |
|
Vicent Llopis
|
06ac8f9910
|
refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-28 09:41:39 +02:00 |
|
Alexandre Riera
|
0c8fe855ac
|
refs #5418 lateral search panel added, missing e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-27 09:11:29 +02:00 |
|
Carlos Satorres
|
fa78649607
|
refs #5439 url filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-24 08:54:03 +01:00 |
|
Carlos Satorres
|
36af9d45e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-23 11:56:40 +01:00 |
|
Alexandre Riera
|
4e5364dc0b
|
refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-23 10:05:02 +01:00 |
|
Carlos Satorres
|
79c42384ee
|
refs #5439 role actualizado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-23 08:26:06 +01:00 |
|
Joan Sanchez
|
7b5e0bae8e
|
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-23 08:20:33 +01:00 |
|
Carlos Satorres
|
3fd1e7a086
|
refs #5439 se elimina el filtro de fecha añadido
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-22 15:41:36 +01:00 |
|
Carlos Satorres
|
1ab8570ed3
|
Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-22 13:28:07 +00:00 |
|
Alexandre Riera
|
60eabbf7a0
|
Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-22 10:37:57 +00:00 |
|
Alexandre Riera
|
59c3ef23de
|
grabUser added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-22 11:03:13 +01:00 |
|
Carlos Satorres
|
1bc3103d9f
|
refs #5439 filtro comercial
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-21 08:44:28 +01:00 |
|
Carlos Satorres
|
306573b1bf
|
refs #5439 campos fecha y salesperson
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-20 15:11:55 +01:00 |
|
Carlos Satorres
|
78d8bbd82a
|
refs #5423 tercer decimal en entrada
|
2023-03-20 10:44:44 +01:00 |
|
Carlos Satorres
|
9e42ab52ce
|
refs #5425 modificación usuario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-17 09:32:20 +01:00 |
|
Carlos Satorres
|
9565bb33f2
|
refs #5425 modificacion de los campos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-16 14:12:54 +01:00 |
|
Carlos Satorres
|
70beaf9b6c
|
refs #5423 añadido 3r decimal
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-16 09:03:16 +01:00 |
|
Joan Sanchez
|
1f52326091
|
Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
|
2023-03-16 06:22:45 +00:00 |
|
Joan Sanchez
|
596a017cfd
|
Don't throw error on file unlink
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2023-03-16 07:18:29 +01:00 |
|
Joan Sanchez
|
a947666838
|
refactor(imageQueue): remplaced sharp with gm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-15 14:24:30 +01:00 |
|
Joan Sanchez
|
6495e016a8
|
Endpoints refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-14 08:17:46 +01:00 |
|
Joan Sanchez
|
1b984f4325
|
Event callback
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-12 20:51:22 +01:00 |
|
Pablo Natek
|
8a4d9bd2bf
|
refs #5211
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-10 12:52:51 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
c9840f6985
|
Updated entry structure
|
2023-02-21 08:32:46 +01: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 |
|
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
|
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
|
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
|
853e06f523
|
fix: card reload automatic
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-17 12:38:07 +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 |
 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
|
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
|
194069c0c2
|
refs #5194 fixed stock, lines
|
2023-02-10 08:46:54 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
 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 |
|
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 |
|
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
|
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 |
|
Alex Moreno
|
c990b9a564
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-30 14:37:24 +01:00 |
|
Alex Moreno
|
4e65e88621
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-30 07:56:12 +01:00 |
|
Vicent Llopis
|
79bf1739ba
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-27 13:52:14 +01:00 |