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

Gross Profit report: Consider Sales team table only if grouped by sales person

Browse Source
This commit is contained in:
Nabin Hait 2017-03-12 17:10:41 +05:30
parent b2a8482cc5
commit 1ed8bc4c36
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,21 +248,31 @@ class GrossProfitGenerator(object):
conditions += " and posting_date >= %(from_date)s" conditions += " and posting_date >= %(from_date)s"
if self.filters.to_date: if self.filters.to_date:
conditions += " and posting_date <= %(to_date)s" conditions += " and posting_date <= %(to_date)s"
if self.filters.group_by=="Sales Person":
sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives"
sales_team_table = "left join `tabSales Team` sales on sales.parent = si.name"
else:
sales_person_cols = ""
sales_team_table = ""
self.si_list = frappe.db.sql("""select item.parenttype, item.parent, self.si_list = frappe.db.sql("""select item.parenttype, item.parent,
si.posting_date, si.posting_time, si.project, si.update_stock, si.posting_date, si.posting_time, si.project, si.update_stock,
si.customer, si.customer_group, si.territory, si.customer, si.customer_group, si.territory,
item.item_code, item.item_name, item.description, item.warehouse, item.item_code, item.item_name, item.description, item.warehouse,
item.item_group, item.brand, item.dn_detail, item.delivery_note, item.item_group, item.brand, item.dn_detail, item.delivery_note,
item.stock_qty as qty, item.base_net_rate, item.base_net_amount, item.name as "item_row", item.stock_qty as qty, item.base_net_rate, item.base_net_amount, item.name as "item_row"
sales.sales_person, sales.allocated_amount, sales.incentives {sales_person_cols}
from `tabSales Invoice` si from
inner join `tabSales Invoice Item` item on item.parent = si.name `tabSales Invoice` si
left join `tabSales Team` sales on sales.parent = si.name inner join `tabSales Invoice Item` item on item.parent = si.name
{sales_team_table}
where where
si.docstatus = 1 and si.is_return != 1 %s si.docstatus = 1 and si.is_return != 1 {conditions}
order by order by
si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1) si.posting_date desc, si.posting_time desc"""
.format(conditions=conditions, sales_person_cols=sales_person_cols,
sales_team_table=sales_team_table), self.filters, as_dict=1)
def load_stock_ledger_entries(self): def load_stock_ledger_entries(self):
res = frappe.db.sql("""select item_code, voucher_type, voucher_no, res = frappe.db.sql("""select item_code, voucher_type, voucher_no,