[new] Filter based on company:
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
index d229b59..f6c3fc0 100644
--- a/erpnext/utilities/page/leaderboard/leaderboard.js
+++ b/erpnext/utilities/page/leaderboard/leaderboard.js
@@ -39,6 +39,7 @@
selected_filter: _initial_filter,
selected_filter_item: _initial_filter[0],
selected_timespan: _initial_timespan,
+ /*selected_company: frappe.defaults.get_default('company')*/
};
this.message = null;
@@ -59,12 +60,30 @@
this.get_sidebar_item(doctype).appendTo(this.$sidebar_list);
});
+
+ this.company_select = this.page.add_field({
+ fieldname: 'company',
+ label: __('Company'),
+ fieldtype:'Link',
+ options:'Company',
+ default:frappe.defaults.get_default('company'),
+ change: function(fieldname) {
+ me.options.selected_company = this.value;
+ me.make_request($container);
+ }
+
+ });
+
+ console.log("com", this.company_select);
+
this.timespan_select = this.page.add_select(__("Timespan"),
this.timespans.map(d => {
return {"label": __(d), value: d }
})
);
+
+
// this.timespan_select.val(this.timespans[1]);
this.type_select = this.page.add_select(__("Type"),
@@ -77,6 +96,7 @@
let $li = $(this);
let doctype = $li.find('span').html();
+ me.options.selected_company = frappe.defaults.get_default('company')
me.options.selected_doctype = doctype;
me.options.selected_filter = me.filters[doctype];
me.options.selected_filter_item = me.filters[doctype][0];
@@ -116,6 +136,7 @@
},
get_leaderboard: function (notify, $container, start=0) {
+ console.log("get", notify)
var me = this;
frappe.call({
@@ -123,6 +144,7 @@
args: {
doctype: me.options.selected_doctype,
timespan: me.options.selected_timespan,
+ company: me.options.selected_company,
field: me.options.selected_filter_item,
start: start
},
@@ -155,6 +177,7 @@
},
get_leaderboard_data: function (me, res, $container) {
+ console.log("me res", me, res)
if (res && res.message) {
me.message = null;
$container.find(".leaderboard-list").html(me.render_list_view(res.message));
@@ -257,9 +280,11 @@
get_item_html: function (item) {
var me = this;
+ const company = frappe.defaults.get_default('Company')
+ const currency = frappe.get_doc(":Company", company).default_currency
const _selected_filter = me.options.selected_filter
.map(i => frappe.model.unscrub(i));
- const fields = ['name', 'value'];
+ const fields = ['name','value'];
const html =
`<div class="list-item">
@@ -274,7 +299,7 @@
`<div class="list-item_content ellipsis list-item__content--flex-2
${(col !== "Name" && col !== "Modified") ? "hidden-xs" : ""}
${(filter == "value") ? "text-right" : ""}">
- ${ col === "Name" ? `<a class="grey list-id ellipsis" href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>` : `<span class="text-muted ellipsis"> ${val}</span>`
+ ${ col === "Name" ? `<a class="grey list-id ellipsis" href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>` : `<span class="text-muted ellipsis"> ${format_currency(val, currency)}</span>`
}
</div>`);
}).join("")
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py
index 6db40ab..14994dd 100644
--- a/erpnext/utilities/page/leaderboard/leaderboard.py
+++ b/erpnext/utilities/page/leaderboard/leaderboard.py
@@ -10,27 +10,28 @@
from erpnext.accounts.utils import get_currency_precision
@frappe.whitelist()
-def get_leaderboard(doctype, timespan, field, start=0):
+def get_leaderboard(doctype, timespan, company, field, start=0):
"""return top 10 items for that doctype based on conditions"""
-
+ for x in xrange(1,10):
+ print('company', company)
filters = get_date_from_string(timespan)
items = []
if doctype == "Customer":
- items = get_all_customers(filters, [], field)
+ items = get_all_customers(filters, company, [], field)
elif doctype == "Item":
items = get_all_items(filters, [], field)
elif doctype == "Supplier":
- items = get_all_suppliers(filters, [], field)
+ items = get_all_suppliers(filters, company, [], field)
elif doctype == "Sales Partner":
items = get_all_sales_partner(filters, [], field)
elif doctype == "Sales Person":
- items = get_all_sales_person(filters, [], field)
+ items = get_all_sales_person(filters, [], field)
if len(items) > 0:
return items
return []
-def get_all_customers(filters, items, field, start=0, limit=20):
+def get_all_customers(filters, company, items, field, start=0, limit=20):
"""return all customers"""
if field == "total_sales_amount":
select_field = "sum(sales_order_item.base_net_amount)"
@@ -40,19 +41,19 @@
return frappe.db.sql("""
select sales_invoice.customer as name, sum(sales_invoice.outstanding_amount) as value
FROM `tabSales Invoice` as sales_invoice
- where sales_invoice.docstatus = 1 and sales_invoice.modified >= "{0}"
+ where sales_invoice.docstatus = 1 and sales_invoice.modified >= "{0}" and sales_invoice.company = "{1}"
group by sales_invoice.customer
order by value DESC
- limit {1}""".format(filters, limit), as_dict=1)
+ limit {2}""".format(filters, company, limit), as_dict=1)
return frappe.db.sql("""
select sales_order.customer as name, {0} as value
FROM `tabSales Order` as sales_order LEFT JOIN `tabSales Order Item`
as sales_order_item ON sales_order.name = sales_order_item.parent
- where sales_order.docstatus = 1 and sales_order.modified >= "{1}"
+ where sales_order.docstatus = 1 and sales_order.modified >= "{1}" and sales_order.company = "{2}"
group by sales_order.customer
order by value DESC
- limit {2}""".format(select_field, filters, limit), as_dict=1)
+ limit {3}""".format(select_field, filters, company, limit), as_dict=1)
@@ -79,7 +80,7 @@
from `tabItem` as item join {1} as B on item.name = B.item_code and item.modified >= "{2}"
group by item.name""".format(select_field, select_doctype, filters), as_dict=1)
-def get_all_suppliers(filters, items, field, start=0, limit=20):
+def get_all_suppliers(filters, company, items, field, start=0, limit=20):
"""return all suppliers"""
if field == "total_purchase_amount":
@@ -90,19 +91,19 @@
return frappe.db.sql("""
select purchase_invoice.supplier as name, sum(purchase_invoice.outstanding_amount) as value
FROM `tabPurchase Invoice` as purchase_invoice
- where purchase_invoice.docstatus = 1 and purchase_invoice.modified >= "{0}"
+ where purchase_invoice.docstatus = 1 and purchase_invoice.modified >= "{0}" and purchase_invoice.company = "{1}"
group by purchase_invoice.supplier
order by value DESC
- limit {1}""".format(filters, limit), as_dict=1)
+ limit {1}""".format(filters, company, limit), as_dict=1)
return frappe.db.sql("""
select purchase_order.supplier as name, {0} as value
FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
as purchase_order_item ON purchase_order.name = purchase_order_item.parent
- where purchase_order.docstatus = 1 and purchase_order.modified >= "{1}"
+ where purchase_order.docstatus = 1 and purchase_order.modified >= "{1}" and purchase_order.company = "{2}"
group by purchase_order.supplier
order by value DESC
- limit {2}""".format(select_field, filters, limit), as_dict=1)
+ limit {3}""".format(select_field, filters, company, limit), as_dict=1)
@@ -165,4 +166,6 @@
else:
days = -7
- return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True)
\ No newline at end of file
+ return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True)
+
+