Commit Graph

836 Commits

Author SHA1 Message Date
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter 2022-12-27 15:00:49 +01:00
Alexandre Riera 96a6f0b9d9 refs #4926 packingOut added 2022-12-27 07:48:09 +01:00
Vicent Llopis d3a9e9ac89 delete: columnas que ya no existen en la tabla 2022-12-23 12:17:24 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup 2022-12-23 12:08:16 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e 2022-12-21 12:55:11 +01:00
Alex Moreno 5d2b69d063 test(item_fixedPrice): front recalculateRate2 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 2022-12-19 14:39:38 +01:00
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
Alex Moreno ec9139f985 Merge branch 'dev' into 4159-tableQ_filter 2022-11-03 07:24:05 +00:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes 2022-11-02 09:40:09 +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 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 2022-10-21 11:41:53 +02:00
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState 2022-10-13 09:22:53 +02:00
Vicent Llopis bfefec397e feat: add testFront 2022-10-11 09:13:29 +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
Joan Sanchez e3606c7273 Updated unit test 2022-10-10 14:46:06 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse 2022-10-10 12:23:40 +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
Joan Sanchez 377a0f7228 Attachments refactor 2022-10-04 13:41:37 +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
Javi Gallego eb48685484 selectores reparados 2022-09-30 14:55:31 +02: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 85698410db Templates refactor 2022-09-26 08:07: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 d0185017b7 Removed translate from grouping and packing 2022-08-11 08:29:24 +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 fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
Reviewed-on: #1011
2022-07-01 09:25:07 +00: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
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary 2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty 2022-06-29 14:28:23 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail 2022-06-27 11:17:45 +02:00
Vicent Llopis 2c721867fc feat(item.summary): add description 2022-06-22 14:30:25 +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
Vicent Llopis 3c9800a7a3 refactor: pull request changes 2022-05-20 12:33:12 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models 2022-05-17 10:13:05 +02:00
Vicent Llopis 76515bdd3f add: search-panel 2022-05-17 09:54:49 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields 2022-05-17 08:32:45 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention 2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows 2022-05-16 07:23:08 +00:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Vicent Llopis 16fdf982c8 feat(item.itemtype): add frontTest 2022-05-12 07:40:24 +02:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType 2022-05-11 14:47:54 +02:00
Vicent Llopis 734f9cb60d feat(item.itemType): added section itemType 2022-05-11 07:28:17 +02:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence 2022-05-09 14:34:20 +02:00
Carlos Jimenez Ruiz b2f930911f fixed problems in two spec files 2022-04-29 09:18:06 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models 2022-04-27 14:17:41 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-20 14:30:23 +02:00
Joan Sanchez 91f111f609 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-04-13 11:33:49 +02:00
Vicent Llopis 804f5f4b2f fix: delete vn-focus and duplicated pagination 2022-04-13 10:37:52 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup 2022-04-11 08:02:05 +02:00
Alex Moreno c7b8b61a08 feat(item): add model itemPackingType 2022-04-08 10:34:36 +02:00
Vicent Llopis eba3ac40a5 refactor: delete item.compression 2022-04-06 11:48:12 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time 2022-04-01 13:55:45 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates 2022-03-30 12:45:01 +02:00
Alex Moreno 1959340163 remove $applyAsync test 2022-03-28 14:04:26 +02:00
Alex Moreno 968ecab9b2 fix(item_diary): apply async scroll 2022-03-24 10:28:28 +01:00
Alex Moreno 3b80f6dec9 renaming 2022-03-23 12:26:58 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e 2022-03-18 10:30:30 +01:00
Alex Moreno e8b4896e98 feat(item_fixed-price): add search, and defaultSerach 2022-03-17 09:13:09 +01:00
Alex Moreno b4e5631cc7 feat(item_fixed-price): implement smart-table 2022-03-16 14:58:07 +01:00
Alex Moreno e0924ea373 refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh 2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz 4b963804c6 added transalation to item waste 2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz 401174b27a removed focus on describe 2022-02-15 13:46:25 +01:00
Carlos Jimenez Ruiz ac0e55107a 3595 feat(toggleHidden): itemWaste now can hide panels 2022-02-15 12:59:57 +01:00
Alex Moreno 902714ba7d feat(item_index): add producer basic filter 2022-02-03 10:32:59 +01:00
Alex Moreno 56331da20b feat(item_index): add column producer 2022-02-01 09:37:11 +01:00
Alex Moreno f21cdeb3b6 fix(item_waste): title background dark 2022-01-31 13:27:33 +01:00
Joan Sanchez b86c32c97b fix(importBuy): prevent action 2022-01-14 08:06:38 +01:00
Vicent Llopis a6e5123949 feat: add filter by item.longName 2021-12-22 13:16:45 +01:00
Alex Moreno 49e9fcaa7c remove unnecesary on-accept 2021-11-29 10:11:47 +01:00
Alex Moreno cff4c90651 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data 2021-11-29 10:10:04 +01:00
Joan Sanchez 452d4557d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-26 14:11:33 +01:00
Joan Sanchez 9d6b870940 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-11-26 14:08:50 +01:00
Joan Sanchez bcca33bc33 Updated icons 2021-11-26 13:04:07 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model 2021-11-26 08:34:32 +01:00
Alex Moreno 02d89e5774 feat(item): add field genericFk in basic-data 2021-11-24 08:51:07 +01:00
Carlos Jimenez Ruiz 51a3673160 Merge branch 'dev' into 3369-filterValue_sqli 2021-11-23 08:54:50 +00:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys 2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz cae3322c6b Merge branch 'dev' into 3332-item_search-panel 2021-11-22 15:28:21 +00:00
Joan Sanchez 4ebad6b372 filter order was not properly being applied 2021-11-22 15:54:01 +01:00
Joan Sanchez 3a2e4c54b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli 2021-11-22 15:49:43 +01:00
Joan Sanchez 90ab78d26d Updated unit tests 2021-11-22 15:49:32 +01:00
Joan Sanchez a940d14256 fix(filterValue): fixed sql injection vulnerability
Refs: 3369
2021-11-22 14:40:03 +01:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo 2021-11-22 11:49:30 +01:00
Alex Moreno 97a66754a7 feat(item and entry): add back test 2021-11-22 08:58:54 +01:00
Alex Moreno d2729e67e9 feat(item and latest-buys: add supplier filter 2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz ca0c3be843 Merge branch 'dev' into 3381-item_diary-claim 2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz e5977be502 Merge branch 'dev' into 3374-itemPackingType 2021-11-19 11:47:37 +00:00
Alex Moreno ac9ed90f4a feat(item): modify item_getBalance and do test 2021-11-19 10:02:40 +01:00
Carlos Jimenez Ruiz 3eb7b4cf55 refactor(item.filter): buildFilter switch refactor 2021-11-18 14:49:05 +01:00
Carlos Jimenez Ruiz 2bfcaa810c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-18 12:40:50 +01:00
Joan Sanchez ba60523012 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-18 12:31:43 +01:00
Joan Sanchez 3ffbdc3fde Updated fonts 2021-11-18 11:48:13 +01:00
Carlos Jimenez Ruiz 4fc01e6a0d typos corrected 2021-11-18 11:18:45 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Vicent Llopis f87f60f00a feat(item-itemPackingType): add model and dumpedFixtures 2021-11-18 09:16:36 +01:00
Alex Moreno b59cabe41a feat(item): add filterParams in main 2021-11-17 09:11:26 +01:00
Alex Moreno 26815ad5a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-17 08:36:35 +01:00
Alex Moreno 6fa60e597a refactor(item): activeBuyer.spec.js 2021-11-16 14:13:15 +01:00
Alex Moreno f27420c14a refactor(item): activeBuyers 2021-11-16 13:56:09 +01:00
Alex Moreno 23b567046b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-16 12:30:28 +01:00
Joan Sanchez a6f8a682db fix(fixed-price): confirm on deletion 2021-11-16 08:41:27 +01:00
Joan Sanchez 5b22892500 fix(fixed-price): changed active buyers endpoint and added pagination 2021-11-16 07:45:15 +01:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js 2021-11-15 14:50:02 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-15 14:40:50 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel 2021-11-15 13:53:18 +01:00
Alex Moreno 73211c5b3b Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-15 12:14:37 +01:00
Alex Moreno adf295ebf3 fix(item): add ng-model, add fixture and transaction back test 2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz d69ee4a597 Merge branch 'dev' into 3328-item_search-panel 2021-11-15 09:34:48 +00:00