From 42231df33a94d0b497f6a92e64a42080ff305c49 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Sun, 20 May 2018 10:46:10 +0530 Subject: [PATCH] [Minor] Supplier Group test fix & default supplier in item fix (#14150) * fix supplier group test * item - default_supplier fix --- erpnext/setup/doctype/supplier_group/test_records.json | 3 ++- erpnext/stock/get_item_details.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/supplier_group/test_records.json b/erpnext/setup/doctype/supplier_group/test_records.json index 1681e2a647..58489637c3 100644 --- a/erpnext/setup/doctype/supplier_group/test_records.json +++ b/erpnext/setup/doctype/supplier_group/test_records.json @@ -1,7 +1,8 @@ [ { "doctype": "Supplier Group", - "supplier_group_name": "_Test Supplier Group" + "supplier_group_name": "_Test Supplier Group", + "parent_supplier_group": "All Supplier Groups" } ] \ No newline at end of file diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 8a194fa7be..9c4083248d 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -251,7 +251,7 @@ def get_basic_details(args, item): "net_rate": 0.0, "net_amount": 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, "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,