Customer/Supplier Name in sales/purchase analytics (#8717)
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index 3e6f23b..10d1321 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -35,11 +35,7 @@
item_key: "supplier",
parent_field: "parent_supplier_type",
formatter: function(item) {
- // return repl('<a href="#Report/stock-invoices/customer=%(enc_value)s">%(value)s</a>', {
- // value: item.name,
- // enc_value: encodeURIComponent(item.name)
- // });
- return item.name;
+ return item.supplier_name ? item.supplier_name + " (" + item.name + ")" : item.name;
}
},
"Supplier": {
@@ -47,7 +43,7 @@
show: false,
item_key: "supplier",
formatter: function(item) {
- return item.name;
+ return item.supplier_name ? item.supplier_name + " (" + item.name + ")" : item.name;
}
},
"Item Group": {
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
index 73793d4..bb47f98 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.js
@@ -34,14 +34,16 @@
show: true,
item_key: "customer",
parent_field: "parent_customer_group",
- formatter: function(item) { return item.customer_name || item.name; }
+ formatter: function(item) {
+ return item.customer_name? item.customer_name + " (" + item.name + ")" : item.name;
+ }
},
"Customer": {
label: __("Customer"),
show: false,
item_key: "customer",
formatter: function(item) {
- return item.customer_name || item.name;
+ return item.customer_name? item.customer_name + " (" + item.name + ")" : item.name;
}
},
"Item Group": {
@@ -67,7 +69,7 @@
item_key: "customer",
parent_field: "parent_territory",
formatter: function(item) {
- return item.name;
+ return item.customer_name? item.customer_name + " (" + item.name + ")" : item.name;
}
}
}