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

Fixed code to consider partial FG entry

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-07-17 16:42:10 +05:30 committed by Nabin Hait
parent 845980c010
commit dde65752b6
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/financial_statements.js
View File

@ -25,12 +25,6 @@ erpnext.financial_statements = {
"options": "Yearly\nHalf-yearly\nQuarterly\nMonthly", "options": "Yearly\nHalf-yearly\nQuarterly\nMonthly",
"default": "Yearly", "default": "Yearly",
"reqd": 1 "reqd": 1
},
{
"fieldname": "accumulated_value",
"label": __("Accumulated Value"),
"fieldtype": "Check",
"depends_on": "eval:accumulated_value= 'Yearly'"
} }
], ],
"formatter": function(row, cell, value, columnDef, dataContext, default_formatter) { "formatter": function(row, cell, value, columnDef, dataContext, default_formatter) {

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

@ -614,14 +614,39 @@ class StockEntry(StockController):
items_dict = frappe.db.sql("""select item_name, item_code, sum(qty) as qty, to_warehouse, from_warehouse, 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 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 se.to_warehouse= %s group by sed.item_code;""", se.production_order= %s and se.to_warehouse= %s group by sed.item_code""",
(self.production_order, self.from_warehouse), as_dict=1) (self.production_order, self.from_warehouse), 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)
transfered_qty= {}
for d in transfered_materials:
transfered_qty.setdefault(d.item_code, d.qty)
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]
manufacturing_qty = flt(po_qty.qty)
produced_qty = flt(po_qty.produced_qty)
trans_qty = flt(po_qty.material_transferred_for_manufacturing)
for item in items_dict: for item in items_dict:
qty= item.qty
if manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)):
qty = (qty/trans_qty) * flt(self.fg_completed_qty)
elif transfered_qty.get(item.item_code):
qty-= transfered_qty.get(item.item_code)
if qty > 0:
self.add_to_stock_entry_detail({ self.add_to_stock_entry_detail({
item.item_code: { item.item_code: {
"to_warehouse": item.to_warehouse, "to_warehouse": item.to_warehouse,
"from_warehouse": item.from_warehouse, "from_warehouse": item.from_warehouse,
"qty": item.qty, "qty": qty,
"item_name": item.item_name, "item_name": item.item_name,
"description": item.description, "description": item.description,
"stock_uom": item.stock_uom, "stock_uom": item.stock_uom,