Commit Graph

323 Commits

Author SHA1 Message Date
Pau da8ebf1509 Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid 2022-11-10 07:17:57 +01:00
Pau 638fd62aae added requested changes, refs #4492 @40m 2022-11-10 07:17:54 +01:00
Pau ae95b5d3ef Merge branch 'dev' into 4492-item.create-same-as-item.isLaid 2022-11-04 07:22:37 +00:00
Pau 37292cee89 remove comments 2022-11-04 08:12:46 +01:00
Pau 11cf1ba414 fix back test error 2022-11-04 07:50:54 +01:00
Pau 7d7af6eb49 Modified model to allow modifications to isLaid 2022-11-04 07:42:21 +01:00
Pau ff5e601a1e Item islaid and test 2022-10-31 14:43:31 +01:00
Vicent Llopis 21e2945d4f refactor: delete destroyAll 2022-10-26 09:30:17 +02:00
Vicent Llopis 9c52508a88 feat: add total labels 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 2022-10-11 07:09:20 +02:00
Vicent Llopis ddbe1057ad feat: add new section 2022-10-06 09:47:53 +02:00
Vicent Llopis 2f17257e46 feat: add new sub section itemShelving 2022-10-05 15:13:48 +02:00
Vicent Llopis 761563edc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route 2022-10-05 13:38:17 +02:00
Vicent Llopis 68e4f3a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route 2022-10-04 09:10:15 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-10-03 13:37:59 +02:00
Joan Sanchez c177c0366d Item PDF 2022-10-03 13:35:49 +02:00
Joan Sanchez e4b61f81a9 Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-03 07:41:58 +00:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-09-29 14:52:31 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor 2022-09-27 14:20:57 +02:00
Pau 901007d34b change test case to expect the image to be defined 2022-09-27 13:58:27 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model 2022-09-27 13:46:23 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density 2022-09-27 09:32:48 +02:00
Joan Sanchez 410e651edd Buyer waste 2022-09-27 07:24:45 +02:00
Joan Sanchez f9f09440ec Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:10:48 +00:00
Joan 90229112e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-09-15 06:35:03 +00:00
Vicent Llopis eb7bd3dc59 update brach 2022-09-14 14:03:15 +02:00
Alex Moreno 6b252f7e33 refactor(item_waste): refactor table and add totals in table_head 2022-09-14 10:13:30 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET 2022-09-13 13:53:44 +02:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk 2022-09-13 11:35:15 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece 2022-08-24 14:13:26 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis 8f54365350 refator: parametrizardo con ? 2022-08-10 09:19:23 +02:00
Vicent Llopis c3d396b042 fix: test e2e 2022-08-04 13:52:59 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk 2022-07-29 13:38:23 +02:00
Vicent Llopis 224ea61a62 fix: delete warehouseFk from itemType model 2022-07-29 13:07:25 +02:00
Vicent Llopis 840e792d13 fix: backTest 2022-07-29 12:52:53 +02:00
Vicent Llopis 605da52286 fix: replace it.warehouseFk by userConfig.warehouseFk 2022-07-29 12:22:03 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-07-27 08:12:06 +02:00
Joan Sanchez f4825488c6 refactor(Tasks API): ghanged method to GET 2022-07-26 11:47:43 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk 2022-07-12 11:52:47 +02:00
Vicent Llopis 6f3d4792d5 update backTest 2022-07-12 10:03:58 +02:00
Vicent Llopis eaa7658b23 delete it.warehouseFk 2022-07-12 10:03:50 +02:00
Joan Sanchez ae79163048 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-06-30 13:17:04 +02:00
Joan Sanchez 140af7e808 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2022-06-30 13:14:08 +02:00
Joan Sanchez ad021265c7 Deprecated field taxTypeFk 2022-06-30 11:42:37 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail 2022-06-27 11:17:45 +02:00
Alex Moreno eb9bd66ddb prepare for static dates 2022-06-09 13:33:01 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models 2022-05-23 12:33:08 +00:00
Vicent Llopis 1b3f0ee026 refactor: added itemPackingType and temperature relations 2022-05-23 12:40:11 +02:00