Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-asset-warehouse-validation

Browse Source
This commit is contained in:
Ankush Menat 2022-03-29 11:48:35 +05:30 committed by GitHub
commit 0cb9cdb414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pre-commit-config.yaml
View File

@ -30,6 +30,7 @@ repos:
rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119 rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
hooks: hooks:
- id: black - id: black
additional_dependencies: ['click==8.0.4']
- repo: https://github.com/timothycrosley/isort - repo: https://github.com/timothycrosley/isort
rev: 5.9.1 rev: 5.9.1

4
erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
View File

@ -177,11 +177,11 @@ def get_customer_details():
def get_item_details(): 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 = {} item_details = {}
for d in details: for d in details:
item_details.setdefault( 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 return item_details