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

Fixed Max value for update FG Item in Production Order

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-07-21 16:13:02 +05:30 committed by Nabin Hait
parent 8ea2f45713
commit b44f26d1ba
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -162,7 +162,7 @@ $.extend(cur_frm.cscript, {
make_se: function(purpose) {
var me = this;
var max = (purpose === "Manufacture") ?
flt(this.frm.doc.qty) - flt(this.frm.doc.produced_qty) :
flt(this.frm.doc.material_transferred_for_manufacturing) - flt(this.frm.doc.produced_qty) :
flt(this.frm.doc.qty) - flt(this.frm.doc.material_transferred_for_manufacturing);
frappe.prompt({fieldtype:"Int", label: __("Qty for {0}", [purpose]), fieldname:"qty",

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

@ -611,16 +611,16 @@ class StockEntry(StockController):
return item_dict
def get_transfered_raw_materials(self):
items_dict = frappe.db.sql("""select item_name, item_code, sum(qty) as qty, to_warehouse, from_warehouse,
description, stock_uom, expense_account, cost_center from `tabStock Entry` se,`tabStock Entry Detail` sed
items_dict = frappe.db.sql("""select item_name, item_code, sum(qty) as qty, sed.s_warehouse as s_warehouse, sed.t_warehouse
as t_warehouse, description, stock_uom, expense_account, cost_center from `tabStock Entry` se,`tabStock Entry Detail` sed
where se.name = sed.parent and se.docstatus=1 and se.purpose='Material Transfer for Manufacture' and
se.production_order= %s and se.to_warehouse= %s group by sed.item_code""",
(self.production_order, self.from_warehouse), as_dict=1)
se.production_order= %s and ifnull(sed.s_warehouse, '') != '' group by sed.item_code, sed.s_warehouse, sed.t_warehouse""",
self.production_order, as_dict=1)
transfered_materials = frappe.db.sql("""select item_code, sum(qty) as qty from `tabStock Entry` se,
`tabStock Entry Detail` sed where se.name = sed.parent and se.docstatus=1 and
se.purpose='Manufacture' and se.production_order= %s and se.from_warehouse= %s
group by sed.item_code""", (self.production_order, self.from_warehouse), as_dict=1)
se.purpose='Manufacture' and se.production_order= %s and ifnull(sed.s_warehouse, '') != ''
group by sed.item_code, sed.s_warehouse, sed.t_warehouse""", self.production_order, as_dict=1)
transfered_qty= {}
for d in transfered_materials:
@ -644,8 +644,8 @@ class StockEntry(StockController):
if qty > 0:
self.add_to_stock_entry_detail({
item.item_code: {
"to_warehouse": item.to_warehouse,
"from_warehouse": item.from_warehouse,
"to_warehouse": item.t_warehouse,
"from_warehouse": item.s_warehouse,
"qty": qty,
"item_name": item.item_name,
"description": item.description,