nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 'get_additonal_costs' is not defined (#20349)

Browse Source 
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
This commit is contained in:
Marica
2020-01-20 15:47:47 +05:30
committed by Nabin Hait
parent e5fbebe126
commit 8b943af911
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -754,18 +754,10 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
if (me.frm.doc.purpose == "Manufacture" || me.frm.doc.purpose == "Material Consumption for Manufacture" ) { if (me.frm.doc.purpose == "Manufacture" || me.frm.doc.purpose == "Material Consumption for Manufacture" ) {
if (me.frm.doc.purpose == "Manufacture") { if (me.frm.doc.purpose == "Manufacture") {
if (!me.frm.doc.to_warehouse) me.frm.set_value("to_warehouse", r.message["fg_warehouse"]); if (!me.frm.doc.to_warehouse) me.frm.set_value("to_warehouse", r.message["fg_warehouse"]);
if (r.message["additional_costs"].length) {
me.frm.clear_table("additional_costs");
$.each(r.message["additional_costs"], function(i, row) {
me.frm.add_child("additional_costs", row);
})
refresh_field("additional_costs");
}
} }
if (!me.frm.doc.from_warehouse) me.frm.set_value("from_warehouse", r.message["wip_warehouse"]); if (!me.frm.doc.from_warehouse) me.frm.set_value("from_warehouse", r.message["wip_warehouse"]);
} }
me.get_items() me.get_items();
} }
} }
}); });

3
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1400,8 +1400,7 @@ def get_work_order_details(work_order, company):
"use_multi_level_bom": work_order.use_multi_level_bom, "use_multi_level_bom": work_order.use_multi_level_bom,
"wip_warehouse": work_order.wip_warehouse, "wip_warehouse": work_order.wip_warehouse,
"fg_warehouse": work_order.fg_warehouse, "fg_warehouse": work_order.fg_warehouse,
"fg_completed_qty": pending_qty_to_produce, "fg_completed_qty": pending_qty_to_produce
"additional_costs": get_additional_costs(work_order, fg_qty=pending_qty_to_produce, company=company)
} }
def get_operating_cost_per_unit(work_order=None, bom_no=None): def get_operating_cost_per_unit(work_order=None, bom_no=None):