mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-18 00:48:42 +00:00
fix(stock): show qty (company) and qty (warehouse) in sales transactions
This commit is contained in:
@@ -280,19 +280,17 @@ erpnext.sales_common = {
|
|||||||
|
|
||||||
set_actual_qty(doc, cdt, cdn) {
|
set_actual_qty(doc, cdt, cdn) {
|
||||||
let row = locals[cdt][cdn];
|
let row = locals[cdt][cdn];
|
||||||
let sales_doctypes = ["Sales Invoice", "Delivery Note", "Sales Order"];
|
let sales_doctypes = ["Sales Invoice", "Delivery Note", "Sales Order", "Quotation"];
|
||||||
|
|
||||||
if (row.item_code && row.warehouse && sales_doctypes.includes(doc.doctype)) {
|
if (row.item_code && row.warehouse && sales_doctypes.includes(doc.doctype)) {
|
||||||
frappe.call({
|
return this.frm.call({
|
||||||
method: "erpnext.stock.get_item_details.get_bin_details",
|
method: "erpnext.stock.get_item_details.get_bin_details",
|
||||||
|
child: row,
|
||||||
args: {
|
args: {
|
||||||
item_code: row.item_code,
|
item_code: row.item_code,
|
||||||
warehouse: row.warehouse,
|
warehouse: row.warehouse,
|
||||||
},
|
company: doc.company,
|
||||||
callback(r) {
|
include_child_warehouses: true,
|
||||||
if (r.message) {
|
|
||||||
frappe.model.set_value(cdt, cdn, "actual_qty", r.message.actual_qty);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,10 +177,9 @@ def update_bin_details(args, out, doc):
|
|||||||
out.update(get_bin_details(args.item_code, args.get("from_warehouse")))
|
out.update(get_bin_details(args.item_code, args.get("from_warehouse")))
|
||||||
|
|
||||||
elif out.get("warehouse"):
|
elif out.get("warehouse"):
|
||||||
company = args.company if (doc and doc.get("doctype") == "Purchase Order") else None
|
bin_details = get_bin_details(
|
||||||
|
args.item_code, out.warehouse, args.company, include_child_warehouses=True
|
||||||
# calculate company_total_stock only for po
|
)
|
||||||
bin_details = get_bin_details(args.item_code, out.warehouse, company, include_child_warehouses=True)
|
|
||||||
|
|
||||||
out.update(bin_details)
|
out.update(bin_details)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user