nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch defualt supplier from the item table (#14113)

Browse Source
This commit is contained in:
Manas Solanki
2018-05-20 10:58:26 +05:30
committed by Nabin Hait
parent 42231df33a
commit f87762887a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/item/item.py
View File

@@ -890,7 +890,7 @@ def get_item_defaults(item, company):
item_defaults = frappe.db.sql(''' item_defaults = frappe.db.sql('''
select select
i.item_name, i.description, i.stock_uom, i.name, i.is_stock_item, i.item_code, i.item_group, i.item_name, i.description, i.stock_uom, i.name, i.is_stock_item, i.item_code, i.item_group,
id.expense_account, id.buying_cost_center, id.default_warehouse, id.selling_cost_center id.expense_account, id.buying_cost_center, id.default_warehouse, id.selling_cost_center, id.default_supplier
from from
`tabItem` i, `tabItem Default` id `tabItem` i, `tabItem Default` id
where where

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_defaults.get("supplier") or '', "supplier": item_defaults.get("default_supplier"),
"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,