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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2016-07-22 12:58:12 +05:30
commit 1adb77ee17
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.27.25' __version__ = '6.27.26'

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

@ -49,7 +49,7 @@ class StockEntry(StockController):
self.validate_batch() self.validate_batch()
self.set_actual_qty() self.set_actual_qty()
self.calculate_rate_and_amount() self.calculate_rate_and_amount(update_finished_item_rate=False)
def on_submit(self): def on_submit(self):
self.update_stock_ledger() self.update_stock_ledger()
@ -234,18 +234,20 @@ class StockEntry(StockController):
self.set_actual_qty() self.set_actual_qty()
self.calculate_rate_and_amount() self.calculate_rate_and_amount()
def calculate_rate_and_amount(self, force=False): def calculate_rate_and_amount(self, force=False, update_finished_item_rate=True):
self.set_basic_rate(force) self.set_basic_rate(force, update_finished_item_rate)
self.distribute_additional_costs() self.distribute_additional_costs()
self.update_valuation_rate() self.update_valuation_rate()
self.set_total_incoming_outgoing_value() self.set_total_incoming_outgoing_value()
self.set_total_amount() self.set_total_amount()
def set_basic_rate(self, force=False): def set_basic_rate(self, force=False, update_finished_item_rate=True):
"""get stock and incoming rate on posting date""" """get stock and incoming rate on posting date"""
raw_material_cost = 0.0 raw_material_cost = 0.0
fg_basic_rate = 0.0
for d in self.get('items'): for d in self.get('items'):
if d.t_warehouse: fg_basic_rate = flt(d.basic_rate)
args = frappe._dict({ args = frappe._dict({
"item_code": d.item_code, "item_code": d.item_code,
"warehouse": d.s_warehouse or d.t_warehouse, "warehouse": d.s_warehouse or d.t_warehouse,
@ -266,13 +268,14 @@ class StockEntry(StockController):
if not d.t_warehouse: if not d.t_warehouse:
raw_material_cost += flt(d.basic_amount) raw_material_cost += flt(d.basic_amount)
self.set_basic_rate_for_finished_goods(raw_material_cost) number_of_fg_items = len([t.t_warehouse for t in self.get("items") if t.t_warehouse])
if (fg_basic_rate == 0.0 and number_of_fg_items == 1) or update_finished_item_rate:
self.set_basic_rate_for_finished_goods(raw_material_cost)
def set_basic_rate_for_finished_goods(self, raw_material_cost): def set_basic_rate_for_finished_goods(self, raw_material_cost):
if self.purpose in ["Manufacture", "Repack"]: if self.purpose in ["Manufacture", "Repack"]:
number_of_fg_items = len([t.t_warehouse for t in self.get("items") if t.t_warehouse])
for d in self.get("items"): for d in self.get("items"):
if d.bom_no or (d.t_warehouse and number_of_fg_items == 1): if d.bom_no or d.t_warehouse:
d.basic_rate = flt(raw_material_cost / flt(d.transfer_qty), d.precision("basic_rate")) d.basic_rate = flt(raw_material_cost / flt(d.transfer_qty), d.precision("basic_rate"))
d.basic_amount = flt(raw_material_cost, d.precision("basic_amount")) d.basic_amount = flt(raw_material_cost, d.precision("basic_amount"))