Merge branch 'develop' into fix-asset-warehouse-validation
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cba6759..dc3011f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,6 +30,7 @@
rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
hooks:
- id: black
+ additional_dependencies: ['click==8.0.4']
- repo: https://github.com/timothycrosley/isort
rev: 5.9.1
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
index da00984..12ca7b3 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
@@ -177,11 +177,11 @@
def get_item_details():
- details = frappe.db.get_all("Item", fields=["item_code", "item_name", "item_group"])
+ details = frappe.db.get_all("Item", fields=["name", "item_name", "item_group"])
item_details = {}
for d in details:
item_details.setdefault(
- d.item_code, frappe._dict({"item_name": d.item_name, "item_group": d.item_group})
+ d.name, frappe._dict({"item_name": d.item_name, "item_group": d.item_group})
)
return item_details