nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in Stock Entry

Browse Source
This commit is contained in:
Neil Trini Lasrado
2015-07-29 15:08:46 +05:30
committed by Nabin Hait
parent b44f26d1ba
commit 1c6eeb228f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,20 +611,20 @@ class StockEntry(StockController):
return item_dict return item_dict
def get_transfered_raw_materials(self): def get_transfered_raw_materials(self):
items_dict = frappe.db.sql("""select item_name, item_code, sum(qty) as qty, sed.s_warehouse as s_warehouse, sed.t_warehouse raw_materials = frappe.db.sql("""select item_name, item_code, sum(qty) as qty, sed.t_warehouse as warehouse,
as t_warehouse, description, stock_uom, expense_account, cost_center from `tabStock Entry` se,`tabStock Entry Detail` sed 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 where se.name = sed.parent and se.docstatus=1 and se.purpose='Material Transfer for Manufacture' and
se.production_order= %s and ifnull(sed.s_warehouse, '') != '' group by sed.item_code, sed.s_warehouse, sed.t_warehouse""", se.production_order= %s and ifnull(sed.t_warehouse, '') != '' group by sed.item_code, sed.t_warehouse""",
self.production_order, as_dict=1) self.production_order, as_dict=1)
transfered_materials = frappe.db.sql("""select item_code, sum(qty) as qty from `tabStock Entry` se, transfered_materials = frappe.db.sql("""select item_code, sed.s_warehouse as warehouse, sum(qty) as qty from `tabStock Entry` se,
`tabStock Entry Detail` sed where se.name = sed.parent and se.docstatus=1 and `tabStock Entry Detail` sed where se.name = sed.parent and se.docstatus=1 and
se.purpose='Manufacture' and se.production_order= %s and ifnull(sed.s_warehouse, '') != '' 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) group by sed.item_code, sed.s_warehouse""", self.production_order, as_dict=1)
transfered_qty= {} transfered_qty= {}
for d in transfered_materials: for d in transfered_materials:
transfered_qty.setdefault(d.item_code, d.qty) transfered_qty.setdefault(d.item_code,[]).append({d.warehouse: d.qty})
po_qty = frappe.db.sql("""select qty, produced_qty, material_transferred_for_manufacturing from po_qty = frappe.db.sql("""select qty, produced_qty, material_transferred_for_manufacturing from
`tabProduction Order` where name=%s""", self.production_order, as_dict=1)[0] `tabProduction Order` where name=%s""", self.production_order, as_dict=1)[0]
@@ -632,20 +632,22 @@ class StockEntry(StockController):
produced_qty = flt(po_qty.produced_qty) produced_qty = flt(po_qty.produced_qty)
trans_qty = flt(po_qty.material_transferred_for_manufacturing) trans_qty = flt(po_qty.material_transferred_for_manufacturing)
for item in items_dict: for item in raw_materials:
qty= item.qty qty= item.qty
if manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)): if manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)):
qty = (qty/trans_qty) * flt(self.fg_completed_qty) qty = (qty/trans_qty) * flt(self.fg_completed_qty)
elif transfered_qty.get(item.item_code): elif transfered_qty.get(item.item_code):
qty-= transfered_qty.get(item.item_code) for d in transfered_qty.get(item.item_code):
if d.get(item.warehouse):
qty-= d.get(item.warehouse)
if qty > 0: if qty > 0:
self.add_to_stock_entry_detail({ self.add_to_stock_entry_detail({
item.item_code: { item.item_code: {
"to_warehouse": item.t_warehouse, "from_warehouse": item.warehouse,
"from_warehouse": item.s_warehouse, "to_warehouse": "",
"qty": qty, "qty": qty,
"item_name": item.item_name, "item_name": item.item_name,
"description": item.description, "description": item.description,