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

Update gross_profit.py

Browse Source 
Gross Profit report improvement
This commit is contained in:
ShashaQin 2016-02-04 11:45:00 +08:00
parent 2d4cc7e71f
commit bcc56a4557
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,9 @@ def execute(filters=None):
source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
group_wise_columns = frappe._dict({ group_wise_columns = frappe._dict({
"invoice": ["parent", "customer", "posting_date", "posting_time", "item_code", "item_name", "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"], "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", "warehouse", "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",
@ -35,7 +35,7 @@ def execute(filters=None):
"gross_profit", "gross_profit_percent"], "gross_profit", "gross_profit_percent"],
"sales_person": ["sales_person", "allocated_amount", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "sales_person": ["sales_person", "allocated_amount", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount",
"gross_profit", "gross_profit_percent"], "gross_profit", "gross_profit_percent"],
"project": ["project", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "project": ["project_name", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"],
"territory": ["territory", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"] "territory": ["territory", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"]
}) })
@ -59,7 +59,7 @@ def get_columns(group_wise_columns, filters):
"posting_time": _("Posting Time"), "posting_time": _("Posting Time"),
"item_code": _("Item Code") + ":Link/Item", "item_code": _("Item Code") + ":Link/Item",
"item_name": _("Item Name"), "item_name": _("Item Name"),
"item_group": _("Item Group") + ":Link/Item", "item_group": _("Item Group") + ":Link/Item Group",
"brand": _("Brand"), "brand": _("Brand"),
"description": _("Description"), "description": _("Description"),
"warehouse": _("Warehouse") + ":Link/Warehouse", "warehouse": _("Warehouse") + ":Link/Warehouse",
@ -70,7 +70,7 @@ def get_columns(group_wise_columns, filters):
"buying_amount": _("Buying Amount") + ":Currency/currency", "buying_amount": _("Buying Amount") + ":Currency/currency",
"gross_profit": _("Gross Profit") + ":Currency/currency", "gross_profit": _("Gross Profit") + ":Currency/currency",
"gross_profit_percent": _("Gross Profit %") + ":Percent", "gross_profit_percent": _("Gross Profit %") + ":Percent",
"project": _("Project") + ":Link/Project", "project_name": _("Project") + ":Link/Project",
"sales_person": _("Sales person"), "sales_person": _("Sales person"),
"allocated_amount": _("Allocated Amount") + ":Currency/currency", "allocated_amount": _("Allocated Amount") + ":Currency/currency",
"customer": _("Customer") + ":Link/Customer", "customer": _("Customer") + ":Link/Customer",