Commit Graph

880 Commits

Author SHA1 Message Date
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Juan Ferrer 081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations 2023-04-24 10:44:42 +02:00
Carlos Satorres 4473cc11c7 Merge branch 'dev' into 5439-inheritRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:43:19 +00:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Juan Ferrer 9694a35343 refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 19:46:57 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Carlos Satorres 33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 14:31:46 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:33:15 +00:00
Joan Sanchez 3ee29553b4 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-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 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-04-17 08:59:49 +02:00
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