From bcc56a4557d8acba4613946bfd2f632614e8c7b4 Mon Sep 17 00:00:00 2001 From: ShashaQin Date: Thu, 4 Feb 2016 11:45:00 +0800 Subject: [PATCH] Update gross_profit.py Gross Profit report improvement --- erpnext/accounts/report/gross_profit/gross_profit.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index 3c90fe29b7..6f6734e7a9 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -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 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", - "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", "buying_rate", "base_amount", "buying_amount", "gross_profit", "gross_profit_percent"], "warehouse": ["warehouse", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", @@ -35,7 +35,7 @@ def execute(filters=None): "gross_profit", "gross_profit_percent"], "sales_person": ["sales_person", "allocated_amount", "qty", "base_rate", "buying_rate", "base_amount", "buying_amount", "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"] }) @@ -59,7 +59,7 @@ def get_columns(group_wise_columns, filters): "posting_time": _("Posting Time"), "item_code": _("Item Code") + ":Link/Item", "item_name": _("Item Name"), - "item_group": _("Item Group") + ":Link/Item", + "item_group": _("Item Group") + ":Link/Item Group", "brand": _("Brand"), "description": _("Description"), "warehouse": _("Warehouse") + ":Link/Warehouse", @@ -70,7 +70,7 @@ def get_columns(group_wise_columns, filters): "buying_amount": _("Buying Amount") + ":Currency/currency", "gross_profit": _("Gross Profit") + ":Currency/currency", "gross_profit_percent": _("Gross Profit %") + ":Percent", - "project": _("Project") + ":Link/Project", + "project_name": _("Project") + ":Link/Project", "sales_person": _("Sales person"), "allocated_amount": _("Allocated Amount") + ":Currency/currency", "customer": _("Customer") + ":Link/Customer",