Commit Graph

184 Commits

Author SHA1 Message Date
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense 2023-11-24 12:42:25 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving 2023-11-05 09:33:18 +01:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev 2023-10-19 13:22:33 +02:00
Alex Moreno f00a4e63a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back 2023-10-13 13:08:54 +02:00
Carlos Andrés 9c0334619d refs #6199 2023-10-13 11:56:50 +02:00
Sergio De la torre 35c0ec0d04 Merge branch 'dev' into 5134-ModelsSalix 2023-10-11 15:14:13 +00:00
Guillermo Bonet 03afea3b8e refs #6199 Added minQuantity in item 2023-10-10 10:51:02 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls 2023-10-02 09:14:30 +02:00
Alex Moreno 75e54bd82f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado 2023-09-28 13:21:12 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix 2023-09-28 08:18:15 +02:00
Sergio De la torre ac3e9c811d refs #5890 feat: itemShelvingSaleAsignado 2023-09-27 14:01:17 +02:00
Sergio De la torre ed1d8ca94f refs #5134 feat: models 2023-09-22 12:29:56 +02:00
Sergio De la torre 022d3d08e6 refs #5652 feat:itemTrash_new 2023-09-01 12:34:33 +02:00
Vicent Llopis 2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-08-22 10:31:17 +00:00
Vicent Llopis 65b9cadd9e refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker 2023-07-27 12:51:14 +02:00
Alex Moreno 44ceeac9c4 refs #5983 feat(itemShelving): add userFk field 2023-07-25 10:21:54 +02:00
Vicent Llopis 8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-07-20 11:42:10 +02:00
Sergio De la torre 49c656928e refs #5983 feat(itemShelving): add visible 2023-07-18 15:43:11 +02:00
Sergio De la torre 93da129239 refs #5983 feat(itemShelving): add getInventory 2023-07-18 08:54:45 +02:00
Vicent Llopis 28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-07-14 11:04:06 +00:00
Carlos Satorres d1c8f0ff11 refs #5949 itemRecycle 2023-07-11 07:37:51 +02:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models 2023-06-07 23:54:27 +02:00
Vicent Llopis 024cb1e3f4 refs #5561 feat: permite modificar registros 2023-06-06 11:56:14 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved 2023-04-24 19:10:04 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 11:41:55 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Alexandre Riera b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price 2023-04-14 07:08:02 +00:00
Alexandre Riera ac4772e44e refs #5418 mistake doing git pull origin dev 2023-04-13 13:46:29 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests 2023-04-12 12:33:14 +02:00
Pablo Natek ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings 2023-04-11 11:56:33 +00:00
David Domenech 44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings 2023-04-05 11:00:08 +00:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-30 14:57:00 +02:00
Vicent Llopis 3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy 2023-03-29 09:11:40 +02:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs 2023-03-22 10:37:57 +00:00
Alexandre Riera 59c3ef23de grabUser added 2023-03-22 11:03:13 +01:00
Joan Sanchez a947666838 refactor(imageQueue): remplaced sharp with gm 2023-03-15 14:24:30 +01:00
Pablo Natek 8a4d9bd2bf refs #5211 2023-03-10 12:52:51 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-03 07:44:31 +01:00
Alexandre Riera 698a3396fc refs #5063 deleted changes in item hook 2023-02-24 10:40:24 +01:00
Alexandre Riera 113b37e56f Merge branch 'dev' into 5063-item-module-doPhoto 2023-02-24 09:25:44 +00:00
Alexandre Riera afb14044cc refs #5063 deleted item checked in image, added front test 2023-02-24 10:25:08 +01:00
Joan Sanchez c9840f6985 Updated entry structure 2023-02-21 08:32:46 +01:00
Alexandre Riera c7f22a10ba refs #5063 refactored hook 2023-02-20 10:39:12 +01:00
Alexandre Riera c1fe09ab5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto 2023-02-20 08:32:33 +01:00
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto 2023-02-03 14:31:50 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser 2023-01-27 08:20:32 +00:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags 2023-01-27 08:21:30 +01:00
Pau ef6b06e147 added logs 2023-01-25 14:44:00 +01:00
Joan Sanchez 3076123c04 Updated models relation 2023-01-24 09:05:50 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00