Commit Graph

510 Commits

Author SHA1 Message Date
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
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Alex Moreno 6b252f7e33 refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 10:13:30 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Joan Sanchez d0185017b7 Removed translate from grouping and packing
gitea/salix/pipeline/head This commit looks good Details
2022-08-11 08:29:24 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 1b3f0ee026 refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable Details
2022-05-23 12:40:11 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Vicent Llopis 76515bdd3f add: search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 09:54:49 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 08:32:45 +02:00
Vicent Llopis 16fdf982c8 feat(item.itemtype): add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 07:40:24 +02:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Vicent Llopis 734f9cb60d feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 07:28:17 +02:00
Joan Sanchez 91f111f609 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 11:33:49 +02:00
Vicent Llopis 804f5f4b2f fix: delete vn-focus and duplicated pagination
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 10:37:52 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis eba3ac40a5 refactor: delete item.compression
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 11:48:12 +02:00
Alex Moreno 1959340163 remove $applyAsync test
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 14:04:26 +02:00
Alex Moreno 968ecab9b2 fix(item_diary): apply async scroll
gitea/salix/pipeline/head This commit looks good Details
2022-03-24 10:28:28 +01:00
Alex Moreno 3b80f6dec9 renaming
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:26:58 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-16 14:58:07 +01:00
Alex Moreno e0924ea373 refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz 4b963804c6 added transalation to item waste
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz 401174b27a removed focus on describe
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:32:59 +01:00
Alex Moreno 56331da20b feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:37:11 +01:00
Alex Moreno f21cdeb3b6 fix(item_waste): title background dark
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 13:27:33 +01:00
Joan Sanchez b86c32c97b fix(importBuy): prevent action
gitea/salix/pipeline/head This commit looks good Details
2022-01-14 08:06:38 +01:00
Alex Moreno 49e9fcaa7c remove unnecesary on-accept
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 14:11:33 +01:00
Joan Sanchez 9d6b870940 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 08:34:32 +01:00
Alex Moreno 02d89e5774 feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 08:51:07 +01:00
Carlos Jimenez Ruiz 51a3673160 Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 08:54:50 +00:00
Joan Sanchez 90ab78d26d Updated unit tests 2021-11-22 15:49:32 +01:00
Joan Sanchez a940d14256 fix(filterValue): fixed sql injection vulnerability
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3369
2021-11-22 14:40:03 +01:00
Alex Moreno d2729e67e9 feat(item and latest-buys: add supplier filter
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 08:27:14 +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
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 12:31:43 +01:00
Joan Sanchez 3ffbdc3fde Updated fonts
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 11:48:13 +01:00
Alex Moreno b59cabe41a feat(item): add filterParams in main
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-17 08:36:35 +01:00
Alex Moreno f27420c14a refactor(item): activeBuyers
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 12:30:28 +01:00
Joan Sanchez a6f8a682db fix(fixed-price): confirm on deletion
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 08:41:27 +01:00
Joan Sanchez 5b22892500 fix(fixed-price): changed active buyers endpoint and added pagination
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 07:45:15 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:40:50 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 62e03f4752 item create e2e fix
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 11:03:23 +01:00
Alex Moreno 6fe7875d73 change route
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:28:19 +01:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 10:33:21 +01:00
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:16 +01:00
Vicent Llopis d3ff60719c fix(last-entries): dateFrom -75 days
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 12:34:56 +01:00
Carlos Jimenez Ruiz 469c544536 item.index default columns and filter with like
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-09 11:47:54 +01:00
Carlos Jimenez Ruiz e4ea05fd07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz 262e46d7c9 added autocompletes to item index 2021-11-08 17:46:40 +01:00
Joan Sanchez eb36f86b9d Added smart-table to item index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 14:46:23 +01:00
Alex Moreno bb0745532b fix(claim): salesPersonFk where add officeBoss
gitea/salix/pipeline/head This commit looks good Details
2021-11-02 11:24:52 +01:00
Carlos Jimenez Ruiz fa067f94d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 16:55:28 +02:00
Vicent Llopis 6d05b046e8 feat(last-entries): add dateTo & delete style.scss
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 10:34:32 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:03:06 +02:00
Alex Moreno a8f8248c41 feat(diary): Add column claim
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 12:33:48 +02:00
Joan Sanchez 3d57e9a618 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:13:13 +02:00
Joan Sanchez 1ff3e1f429 Increased date range from +10 to +60 days
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:12:25 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz f74d2cc302 test(tags): moved code used on a single test to the correct place
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 15:16:45 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 538805828e refactor(item): item index now shows last buy landing 2021-09-08 10:39:54 +02:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz 52e1df2af5 removed the usage of niches from item index and summary 2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz 8a6da66916 removed niche section 2021-08-30 13:31:07 +02:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:17:48 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez 378175224c HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:24:24 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00