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

[Fixed] Merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-06-21 13:09:18 +05:30
parent 1ded5c618e 2ef637b346
commit 64c8e28423
9 changed files with 143 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stock/report/item_prices/item_prices.py
View File

@@ -39,7 +39,7 @@ def execute(filters=None):
pl.get(item, {}).get("selling"),
pl.get(item, {}).get("buying"),
flt(bom_rate.get(item, 0), precision),
flt(item_map[item]["standard_rate"])
flt(item_map[item]["standard_rate"], precision)
])
return columns, data
@@ -142,8 +142,9 @@ def get_valuation_rate():
item_val_rate_map = {}
for d in webnotes.conn.sql("""select item_code, avg(valuation_rate) as val_rate
from tabBin group by item_code""", as_dict=1):
item_val_rate_map.setdefault(d.item_code, flt(d.val_rate))
for d in webnotes.conn.sql("""select item_code,
sum(actual_qty*valuation_rate)/sum(actual_qty) as val_rate
from tabBin where actual_qty > 0 group by item_code""", as_dict=1):
item_val_rate_map.setdefault(d.item_code, d.val_rate)
return item_val_rate_map
return item_val_rate_map