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

fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse

Browse Source
This commit is contained in:
Saif Ur Rehman 2019-01-09 13:43:06 +05:00
parent bf0b6fd8a9
commit 2689dea72a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/controllers/transaction.js
View File

@ -416,6 +416,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
item_code: item.item_code, item_code: item.item_code,
barcode: item.barcode, barcode: item.barcode,
serial_no: item.serial_no, serial_no: item.serial_no,
set_warehouse: me.frm.doc.set_warehouse,
warehouse: item.warehouse, warehouse: item.warehouse,
customer: me.frm.doc.customer, customer: me.frm.doc.customer,
supplier: me.frm.doc.supplier, supplier: me.frm.doc.supplier,

4
erpnext/stock/get_item_details.py
View File

@ -36,6 +36,7 @@ def get_item_details(args):
"is_subcontracted": "Yes" / "No", "is_subcontracted": "Yes" / "No",
"ignore_pricing_rule": 0/1 "ignore_pricing_rule": 0/1
"project": "" "project": ""
"set_warehouse": ""
} }
""" """
args = process_args(args) args = process_args(args)
@ -189,7 +190,6 @@ def get_basic_details(args, item):
"project": "", "project": "",
barcode: "", barcode: "",
serial_no: "", serial_no: "",
warehouse: "",
currency: "", currency: "",
update_stock: "", update_stock: "",
price_list: "", price_list: "",
@ -219,7 +219,7 @@ def get_basic_details(args, item):
item_defaults = get_item_defaults(item.name, args.company) item_defaults = get_item_defaults(item.name, args.company)
item_group_defaults = get_item_group_defaults(item.name, args.company) item_group_defaults = get_item_group_defaults(item.name, args.company)
warehouse = user_default_warehouse or item_defaults.get("default_warehouse") or\ warehouse = args.get("set_warehouse") or user_default_warehouse or item_defaults.get("default_warehouse") or\
item_group_defaults.get("default_warehouse") or args.warehouse item_group_defaults.get("default_warehouse") or args.warehouse
if args.get('doctype') == "Material Request" and not args.get('material_request_type'): if args.get('doctype') == "Material Request" and not args.get('material_request_type'):