nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes in gross profit report

Browse Source
This commit is contained in:
Anand Doshi
2013-03-21 18:45:02 +05:30
parent 162a081a9f
commit 6d8d3b4cee
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -793,7 +793,7 @@ class DocType(SellingController):
def set_buying_amount(self):
if cint(self.doc.is_pos) and cint(self.doc.update_stock):
stock_ledger_entries = self.get_stock_ledger_entries()
item_sales_bom = get_sales_bom()
item_sales_bom = get_sales_bom(self.doc.doctype, self.doc.name)
else:
stock_ledger_entries = item_sales_bom = None

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

@@ -7,7 +7,8 @@ def execute(filters=None):
if not filters: filters = {}
stock_ledger_entries = get_stock_ledger_entries(filters)
item_sales_bom = get_sales_bom()
item_sales_bom = get_sales_bom("Delivery Note")
delivery_note_items = webnotes.conn.sql("""select dn.name, dn.posting_date, dn.posting_time,
dn.project_name, item.item_code, item.item_name, item.description, item.warehouse,
@@ -25,7 +26,9 @@ def execute(filters=None):
for row in delivery_note_items:
selling_amount = flt(row.amount)
buying_amount = get_buying_amount(row.item_code, row.warehouse, -1*row.qty,
"Delivery Note", row.name, row.item_row, stock_ledger_entries, item_sales_bom)
"Delivery Note", row.name, row.item_row, stock_ledger_entries,
item_sales_bom.get(row.name, webnotes._dict()))
buying_amount = buying_amount > 0 and buying_amount or 0
if selling_amount: