diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index f6c3fc08bca..860506b9615 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -39,7 +39,6 @@ frappe.Leaderboard = Class.extend({ selected_filter: _initial_filter, selected_filter_item: _initial_filter[0], selected_timespan: _initial_timespan, - /*selected_company: frappe.defaults.get_default('company')*/ }; this.message = null; @@ -60,22 +59,18 @@ frappe.Leaderboard = Class.extend({ 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) { + change: function() { 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 } @@ -96,7 +91,7 @@ frappe.Leaderboard = Class.extend({ let $li = $(this); let doctype = $li.find('span').html(); - me.options.selected_company = frappe.defaults.get_default('company') + 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]; @@ -136,7 +131,6 @@ frappe.Leaderboard = Class.extend({ }, get_leaderboard: function (notify, $container, start=0) { - console.log("get", notify) var me = this; frappe.call({ @@ -177,7 +171,6 @@ frappe.Leaderboard = Class.extend({ }, 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)); @@ -280,8 +273,8 @@ frappe.Leaderboard = Class.extend({ 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 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']; diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py index 14994ddb761..0d580b42504 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.py +++ b/erpnext/utilities/page/leaderboard/leaderboard.py @@ -12,8 +12,6 @@ from erpnext.accounts.utils import get_currency_precision @frappe.whitelist() 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": @@ -94,7 +92,7 @@ def get_all_suppliers(filters, company, items, field, start=0, limit=20): 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, company, limit), as_dict=1) + limit {2}""".format(filters, company, limit), as_dict=1) return frappe.db.sql(""" select purchase_order.supplier as name, {0} as value @@ -103,7 +101,7 @@ def get_all_suppliers(filters, company, items, field, start=0, limit=20): 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 {3}""".format(select_field, filters, company, limit), as_dict=1) + limit {3}""".format(select_field, filters, company, limit), as_dict=1)