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

[Fix] Incoming rate for gross profit report (#12422)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-01-11 12:58:46 +05:30 committed by Nabin Hait
parent 5b45bcf5f3
commit 02302ff009
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -255,10 +255,12 @@ class GrossProfitGenerator(object):
from `tabPurchase Invoice Item` from `tabPurchase Invoice Item`
where item_code = %s and docstatus=1""", item_code)[0][0]) where item_code = %s and docstatus=1""", item_code)[0][0])
else: else:
row.voucher_type = row.parenttype
row.voucher_no = row.parent
average_buying_rate = get_incoming_rate(row) average_buying_rate = get_incoming_rate(row)
if not average_buying_rate: if not average_buying_rate:
average_buying_rate = get_valuation_rate(item_code, row.warehouse, average_buying_rate = get_valuation_rate(item_code, row.warehouse,
row.parenttype, row.parent, allow_zero_rate=True, row.parenttype, row.parent, allow_zero_rate=row.allow_zero_valuation,
currency=self.filters.currency, company=self.filters.company) currency=self.filters.currency, company=self.filters.company)
self.average_buying_rate[item_code] = flt(average_buying_rate) self.average_buying_rate[item_code] = flt(average_buying_rate)
@ -309,7 +311,8 @@ class GrossProfitGenerator(object):
`tabSales Invoice Item`.brand, `tabSales Invoice Item`.dn_detail, `tabSales Invoice Item`.brand, `tabSales Invoice Item`.dn_detail,
`tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty, `tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty,
`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount, `tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
`tabSales Invoice Item`.name as "item_row", `tabSales Invoice`.is_return `tabSales Invoice Item`.name as "item_row", `tabSales Invoice`.is_return,
`tabSales Invoice Item`.allow_zero_valuation_rate as "allow_zero_valuation"
{sales_person_cols} {sales_person_cols}
from from
`tabSales Invoice` inner join `tabSales Invoice Item` `tabSales Invoice` inner join `tabSales Invoice Item`