Commit Graph

603 Commits

Author SHA1 Message Date
Juan Ferrer 677764f302 refs #5517 Fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:00:21 +02:00
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 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
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
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
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
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 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
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
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
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
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
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
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 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 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
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
Alexandre Riera 04877c1425 refs #5063 refactor hook
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 13:15:47 +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 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
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 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 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 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:19:33 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Pau b446f5cf5f Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:21:53 +01:00
Pau 2e988ea701 doPhoto updated on item upload
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 13:34:36 +01:00
Alexandre Riera a473d3a6f9 refs #4945 changed input-number for autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:01:13 +01:00
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:29:42 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Pau 99338bb6f8 isPhotoRequired implemented 2023-01-17 10:11:41 +01:00
Alexandre Riera 4e1c43eb4d refs #4945 nombre temporal removed
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:01:49 +01:00
Alex Moreno ff39a81b8c Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 06:07:14 +00:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Vicent Llopis 3abbfc4fa7 refacotr
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 10:35:55 +01:00
Vicent Llopis 22d0da273e refs #4925 fix: coge únicamente los últimos cambios aplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:21:51 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 14:24:32 +01:00
Alexandre Riera 96a6f0b9d9 refs #4926 packingOut added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:48:09 +01:00
Alex Moreno 5d2b69d063 test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 15:06:59 +01:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 14:39:38 +01:00
Alex Moreno ec9139f985 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:24:05 +00:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +01:00
Vicent Llopis 8a3573474a refactor: move 'lastEntries' to thrid position in descriptor 2022-10-25 07:40:32 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:22:53 +02:00
Vicent Llopis bfefec397e feat: add testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 09:13:29 +02:00
Vicent Llopis 9c52508a88 feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:40:22 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +02:00
Joan Sanchez e3606c7273 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:46:06 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:23:40 +02:00
Vicent Llopis ddbe1057ad feat: add new section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:47:53 +02:00
Vicent Llopis 2f17257e46 feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 15:13:48 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Javi Gallego eb48685484 selectores reparados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:55:31 +02:00