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

gross profit report fix

Browse Source
This commit is contained in:
Nabin Hait 2015-05-19 11:07:47 +05:30
parent 4a3c805049
commit 0a705fe582
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ def execute(filters=None):
def get_columns(group_wise_columns, filters): def get_columns(group_wise_columns, filters):
columns = [] columns = []
column_map = frappe._dict({ column_map = frappe._dict({
"name": _("Sales Invoice") + "::120", "name": _("Sales Invoice") + ":Link/Sales Invoice:120",
"posting_date": _("Posting Date") + ":Date", "posting_date": _("Posting Date") + ":Date",
"posting_time": _("Posting Time"), "posting_time": _("Posting Time"),
"item_code": _("Item Code") + ":Link/Item", "item_code": _("Item Code") + ":Link/Item",
@ -159,7 +159,7 @@ class GrossProfitGenerator(object):
def get_buying_amount_from_sales_bom(self, row, sales_bom): def get_buying_amount_from_sales_bom(self, row, sales_bom):
buying_amount = 0.0 buying_amount = 0.0
for bom_item in sales_bom[row.item_code]: for bom_item in sales_bom[row.item_code]:
if bom_item.get("parent_detail_docname")==row.name: if bom_item.get("parent_detail_docname")==row.item_row:
buying_amount += self.get_buying_amount(row, bom_item.item_code) buying_amount += self.get_buying_amount(row, bom_item.item_code)
return buying_amount return buying_amount
@ -177,13 +177,13 @@ class GrossProfitGenerator(object):
if row.dn_detail: if row.dn_detail:
row.parenttype = "Delivery Note" row.parenttype = "Delivery Note"
row.parent = row.delivery_note row.parent = row.delivery_note
row.name = row.dn_detail row.item_row = row.dn_detail
my_sle = self.sle.get((item_code, row.warehouse)) my_sle = self.sle.get((item_code, row.warehouse))
for i, sle in enumerate(my_sle): for i, sle in enumerate(my_sle):
# find the stock valution rate from stock ledger entry # find the stock valution rate from stock ledger entry
if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \ if sle.voucher_type == row.parenttype and row.parent == sle.voucher_no and \
sle.voucher_detail_no == row.name: sle.voucher_detail_no == row.item_row:
previous_stock_value = len(my_sle) > i+1 and \ previous_stock_value = len(my_sle) > i+1 and \
flt(my_sle[i+1].stock_value) or 0.0 flt(my_sle[i+1].stock_value) or 0.0
return previous_stock_value - flt(sle.stock_value) return previous_stock_value - flt(sle.stock_value)