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

[fixes] typo-fixes and fix in balance qty fetching

Browse Source
This commit is contained in:
Saurabh 2016-02-18 17:38:56 +05:30
parent dcb72c6be7
commit 3724448cd3
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/doctype/quotation/quotation.js
View File

@ -165,8 +165,7 @@ frappe.ui.form.on("Quotation Item", "items_on_form_rendered", function(frm, cdt,
}) })
frappe.ui.form.on("Quotation Item", "stock_balance", function(frm, cdt, cdn) { frappe.ui.form.on("Quotation Item", "stock_balance", function(frm, cdt, cdn) {
console.log("here") var d = frappe.model.get_doc(cdt, cdn);
var d = locals[cdt][cdn];
frappe.route_options = {"item_code": d.item_code}; frappe.route_options = {"item_code": d.item_code};
frappe.set_route("query-report", "Stock Balance"); frappe.set_route("query-report", "Stock Balance");
}) })

9
erpnext/stock/get_item_details.py
View File

@ -165,7 +165,7 @@ def get_basic_details(args, item):
"discount_percentage": 0.0, "discount_percentage": 0.0,
"supplier": item.default_supplier, "supplier": item.default_supplier,
"delivered_by_supplier": item.delivered_by_supplier, "delivered_by_supplier": item.delivered_by_supplier,
"actual_qty": get_item_balance_qty_for_default_warehouse(item) "actual_qty": get_available_qty(item.name, user_default_warehouse or args.warehouse or item.default_warehouse)
}) })
# if default specified in item is for another company, fetch from company # if default specified in item is for another company, fetch from company
@ -464,10 +464,3 @@ def get_default_bom(item_code=None):
return bom return bom
else: else:
frappe.throw(_("No default BOM exists for Item {0}").format(item_code)) frappe.throw(_("No default BOM exists for Item {0}").format(item_code))
def get_item_balance_qty_for_default_warehouse(item):
item = frappe.get_doc("Item", item.name)
return frappe.db.get_value("Bin", {"item_code": item.name, "warehouse": item.default_warehouse},
["actual_qty"], as_dict=True) or {"actual_qty": 0}