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

[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report

Browse Source
This commit is contained in:
shreyas 2016-03-09 13:15:38 +05:30
parent 007e87b8a5
commit 7c42995949
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

@ -9,7 +9,7 @@ from frappe.utils import flt
def execute(filters=None): def execute(filters=None):
if not filters: filters = frappe._dict() if not filters: filters = frappe._dict()
company_currency = frappe.db.get_value("Company", filters.company, "default_currency") company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
gross_profit_data = GrossProfitGenerator(filters) gross_profit_data = GrossProfitGenerator(filters)
data = [] data = []
@ -19,7 +19,7 @@ def execute(filters=None):
"invoice": ["parent", "customer", "posting_date","item_code", "item_name","item_group", "brand", "description", \ "invoice": ["parent", "customer", "posting_date","item_code", "item_name","item_group", "brand", "description", \
"warehouse", "qty", "base_rate", "buying_rate", "base_amount", "warehouse", "qty", "base_rate", "buying_rate", "base_amount",
"buying_amount", "gross_profit", "gross_profit_percent", "project_name"], "buying_amount", "gross_profit", "gross_profit_percent", "project_name"],
"item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate", "item_code": ["item_code", "item_name", "brand", "description", "qty", "base_rate",
"buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"],
"warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
"gross_profit", "gross_profit_percent"], "gross_profit", "gross_profit_percent"],
@ -45,7 +45,7 @@ def execute(filters=None):
row = [] row = []
for col in group_wise_columns.get(scrub(filters.group_by)): for col in group_wise_columns.get(scrub(filters.group_by)):
row.append(src.get(col)) row.append(src.get(col))
row.append(company_currency) row.append(company_currency)
data.append(row) data.append(row)
@ -80,7 +80,7 @@ def get_columns(group_wise_columns, filters):
for col in group_wise_columns.get(scrub(filters.group_by)): for col in group_wise_columns.get(scrub(filters.group_by)):
columns.append(column_map.get(col)) columns.append(column_map.get(col))
columns.append({ columns.append({
"fieldname": "currency", "fieldname": "currency",
"label" : _("Currency"), "label" : _("Currency"),