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

Revert "Stock Entry: get fg item incoming rate if bom is mentioned"

Browse Source 
This reverts commit 297939325a49f51140971f99c5f240162b656f36.
This commit is contained in:
Anand Doshi 2014-06-18 14:05:08 +05:30
parent c5dbf0f8ad
commit 987a28fc6a
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,8 +217,8 @@ class StockEntry(StockController):
Available Qty: {4}, Transfer Qty: {5}""").format(d.idx, d.s_warehouse, Available Qty: {4}, Transfer Qty: {5}""").format(d.idx, d.s_warehouse,
self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty)) self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty))
# get incoming rate
if not d.bom_no: if not d.bom_no:
# set incoming rate
if not flt(d.incoming_rate) or d.s_warehouse or self.purpose == "Sales Return": if not flt(d.incoming_rate) or d.s_warehouse or self.purpose == "Sales Return":
incoming_rate = self.get_incoming_rate(args) incoming_rate = self.get_incoming_rate(args)
if flt(incoming_rate) > 0: if flt(incoming_rate) > 0:
@ -227,16 +227,15 @@ class StockEntry(StockController):
d.amount = flt(d.transfer_qty) * flt(d.incoming_rate) d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
raw_material_cost += flt(d.amount) raw_material_cost += flt(d.amount)
# bom no exists and purpose is Manufacture/Repack # set incoming rate for fg item
elif self.purpose == "Manufacture/Repack": if self.production_order and self.purpose == "Manufacture/Repack":
for d in self.get("mtn_details"):
# set incoming rate for fg item if d.bom_no:
if not flt(d.incoming_rate): if not flt(d.incoming_rate):
bom = frappe.db.get_value("BOM", d.bom_no, ["operating_cost", "quantity"], as_dict=1) bom = frappe.db.get_value("BOM", d.bom_no, ["operating_cost", "quantity"], as_dict=1)
operation_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity) operation_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
d.incoming_rate = operation_cost_per_unit + (raw_material_cost / flt(d.transfer_qty)) d.incoming_rate = operation_cost_per_unit + (raw_material_cost / flt(d.transfer_qty))
d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
def get_incoming_rate(self, args): def get_incoming_rate(self, args):
incoming_rate = 0 incoming_rate = 0