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

[Minor] Supplier Group test fix & default supplier in item fix (#14150)

Browse Source 
* fix supplier group test

* item - default_supplier fix
This commit is contained in:
Zarrar 2018-05-20 10:46:10 +05:30 committed by Nabin Hait
parent 1f3f18534b
commit 42231df33a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/setup/doctype/supplier_group/test_records.json
View File

@ -1,7 +1,8 @@
[ [
{ {
"doctype": "Supplier Group", "doctype": "Supplier Group",
"supplier_group_name": "_Test Supplier Group" "supplier_group_name": "_Test Supplier Group",
"parent_supplier_group": "All Supplier Groups"
} }
] ]

2
erpnext/stock/get_item_details.py
View File

@ -251,7 +251,7 @@ def get_basic_details(args, item):
"net_rate": 0.0, "net_rate": 0.0,
"net_amount": 0.0, "net_amount": 0.0,
"discount_percentage": 0.0, "discount_percentage": 0.0,
"supplier": item.default_supplier, "supplier": item_defaults.get("supplier") or '',
"update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0, "update_stock": args.get("update_stock") if args.get('doctype') in ['Sales Invoice', 'Purchase Invoice'] else 0,
"delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0, "delivered_by_supplier": item.delivered_by_supplier if args.get("doctype") in ["Sales Order", "Sales Invoice"] else 0,
"is_fixed_asset": item.is_fixed_asset, "is_fixed_asset": item.is_fixed_asset,