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

fix: Report link, option, and added a link for Sales Person in GP

Browse Source
This commit is contained in:
Nihantra Patel 2023-04-27 15:04:50 +05:30
parent 01bfd2ab67
commit 6dfca79af3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/gross_profit/gross_profit.js
View File

@ -73,7 +73,7 @@ frappe.query_reports["Gross Profit"] = {
if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) { if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) {
column._options = "Sales Invoice"; column._options = "Sales Invoice";
} else { } else {
column._options = "Item"; column._options = "";
} }
value = default_formatter(value, row, column, data); value = default_formatter(value, row, column, data);

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

@ -250,7 +250,7 @@ def get_columns(group_wise_columns, filters):
"label": _("Warehouse"), "label": _("Warehouse"),
"fieldname": "warehouse", "fieldname": "warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"options": "warehouse", "options": "Warehouse",
"width": 100, "width": 100,
}, },
"qty": {"label": _("Qty"), "fieldname": "qty", "fieldtype": "Float", "width": 80}, "qty": {"label": _("Qty"), "fieldname": "qty", "fieldtype": "Float", "width": 80},
@ -305,7 +305,8 @@ def get_columns(group_wise_columns, filters):
"sales_person": { "sales_person": {
"label": _("Sales Person"), "label": _("Sales Person"),
"fieldname": "sales_person", "fieldname": "sales_person",
"fieldtype": "Data", "fieldtype": "Link",
"options": "Sales Person",
"width": 100, "width": 100,
}, },
"allocated_amount": { "allocated_amount": {
@ -326,14 +327,14 @@ def get_columns(group_wise_columns, filters):
"label": _("Customer Group"), "label": _("Customer Group"),
"fieldname": "customer_group", "fieldname": "customer_group",
"fieldtype": "Link", "fieldtype": "Link",
"options": "customer", "options": "Customer Group",
"width": 100, "width": 100,
}, },
"territory": { "territory": {
"label": _("Territory"), "label": _("Territory"),
"fieldname": "territory", "fieldname": "territory",
"fieldtype": "Link", "fieldtype": "Link",
"options": "territory", "options": "Territory",
"width": 100, "width": 100,
}, },
"monthly": { "monthly": {