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

Update gross_profit.py

Browse Source
This commit is contained in:
Pawan Mehta 2016-08-22 17:47:13 +05:30 committed by GitHub
parent 18bb431baa
commit bee3b40725
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,14 +93,14 @@ def get_columns(group_wise_columns, filters):
class GrossProfitGenerator(object): class GrossProfitGenerator(object):
def __init__(self, filters=None): def __init__(self, filters=None):
self.data = [] self.data = []
self.average_buying_rate = {} self.average_buying_rate = {}
self.filters = frappe._dict(filters) self.filters = frappe._dict(filters)
self.load_invoice_items() self.load_invoice_items()
self.load_stock_ledger_entries() self.load_stock_ledger_entries()
self.load_product_bundle() self.load_product_bundle()
self.load_non_stock_items() self.load_non_stock_items()
self.process() self.process()
def process(self): def process(self):
self.grouped = {} self.grouped = {}
@ -234,14 +234,13 @@ class GrossProfitGenerator(object):
where a.item_code = %s and a.docstatus=1 where a.item_code = %s and a.docstatus=1
and modified <= %s and modified <= %s
order by a.modified desc limit 1""", (item_code,self.filters.to_date)) order by a.modified desc limit 1""", (item_code,self.filters.to_date))
return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0
else: else:
last_purchase_rate = frappe.db.sql(""" last_purchase_rate = frappe.db.sql("""
select (a.base_rate / a.conversion_factor) select (a.base_rate / a.conversion_factor)
from `tabPurchase Invoice Item` a from `tabPurchase Invoice Item` a
where a.item_code = %s and a.docstatus=1 where a.item_code = %s and a.docstatus=1
order by a.modified desc limit 1""", item_code) order by a.modified desc limit 1""", item_code)
return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0 return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0
def load_invoice_items(self): def load_invoice_items(self):
conditions = "" conditions = ""