From 09acb779d79330186c0e273d05ec8b3c6c217de4 Mon Sep 17 00:00:00 2001 From: vishdha Date: Tue, 20 Feb 2018 12:44:11 +0530 Subject: [PATCH 1/6] [new] Leader board --- .../utilities/page/leaderboard/leaderboard.js | 22 +- .../utilities/page/leaderboard/leaderboard.py | 232 +++++++++--------- 2 files changed, 121 insertions(+), 133 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index 7e70f76fa0..d229b59799 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -17,14 +17,15 @@ frappe.Leaderboard = Class.extend({ this.$sidebar_list = this.page.sidebar.find('ul'); // const list of doctypes - this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner"]; + this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"]; this.timespans = ["Week", "Month", "Quarter", "Year"]; - this.desc_fields = ["total_amount", "total_request", "annual_billing", "commission_rate"]; + this.desc_fields = ["total_sales_amount", "total_request","total_purchase_amount","commission_rate"]; this.filters = { - "Customer": ["total_amount", "total_item_purchased"], - "Item": ["total_request", "total_purchase", "avg_price"], - "Supplier": ["annual_billing", "total_unpaid"], - "Sales Partner": ["commission_rate", "target_qty", "target_amount"], + "Customer": ["total_item_purchased_qty", "total_sales_amount","receivable_amount_outstanding_amount"], + "Item": ["total_purchase_amount", "total_purchased_qty", "total_sales_amount", "total_sold_qty","available_stock_qty"], + "Supplier": ["total_item_sold_qty", "total_purchase_amount","payable_amount_outstanding_amount"], + "Sales Partner": ["commission_rate", "target_qty", "target_amount", "total_sales_amount"], + "Sales Person": ["target_qty", "target_amount", "total_sales_amount"], }; // for saving current selected filters @@ -258,7 +259,7 @@ frappe.Leaderboard = Class.extend({ var me = this; const _selected_filter = me.options.selected_filter .map(i => frappe.model.unscrub(i)); - const fields = ['name', me.options.selected_filter_item]; + const fields = ['name', 'value']; const html = `
@@ -272,11 +273,8 @@ frappe.Leaderboard = Class.extend({ return ( `
- ${ - col === "Name" - ? ` ${val} ` - : ` ${val}` + ${(filter == "value") ? "text-right" : ""}"> + ${ col === "Name" ? ` ${val} ` : ` ${val}` }
`); }).join("") diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py index 6e7eabc826..6db40abadb 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.py +++ b/erpnext/utilities/page/leaderboard/leaderboard.py @@ -13,135 +13,145 @@ from erpnext.accounts.utils import get_currency_precision def get_leaderboard(doctype, timespan, field, start=0): """return top 10 items for that doctype based on conditions""" - filters = {"modified":(">=", get_date_from_string(timespan))} + filters = get_date_from_string(timespan) items = [] if doctype == "Customer": - items = get_all_customers(doctype, filters, [], field) + items = get_all_customers(filters, [], field) elif doctype == "Item": - items = get_all_items(doctype, filters, [], field) + items = get_all_items(filters, [], field) elif doctype == "Supplier": - items = get_all_suppliers(doctype, filters, [], field) + items = get_all_suppliers(filters, [], field) elif doctype == "Sales Partner": - items = get_all_sales_partner(doctype, filters, [], field) + items = get_all_sales_partner(filters, [], field) + elif doctype == "Sales Person": + items = get_all_sales_person(filters, [], field) if len(items) > 0: return items return [] -def get_all_customers(doctype, filters, items, field, start=0, limit=20): +def get_all_customers(filters, items, field, start=0, limit=20): """return all customers""" + if field == "total_sales_amount": + select_field = "sum(sales_order_item.base_net_amount)" + elif field == "total_item_purchased_qty": + select_field = "count(sales_order_item.name)" + elif field == "receivable_amount_outstanding_amount": + 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}" + group by sales_invoice.customer + order by value DESC + limit {1}""".format(filters, limit), as_dict=1) - x = frappe.get_list(doctype, filters=filters, limit_start=start, limit_page_length=limit) + 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}" + group by sales_order.customer + order by value DESC + limit {2}""".format(select_field, filters, limit), as_dict=1) - for val in x: - y = dict(frappe.db.sql('''select name, grand_total from `tabSales Invoice` where customer = %s''', (val.name))) - invoice_list = y.keys() - if len(invoice_list) > 0: - item_count = frappe.db.sql('''select count(name) from `tabSales Invoice Item` where parent in (%s)''' % ", ".join( - ['%s'] * len(invoice_list)), tuple(invoice_list)) - value = 0 - if(field=="total_amount"): - value = sum(y.values()) - elif(field=="total_item_purchased"): - value = sum(destructure_tuple_of_tuples(item_count)) - item_obj = {"name": val.name, - "total_amount": get_formatted_value(sum(y.values())), - "total_item_purchased": sum(destructure_tuple_of_tuples(item_count)), - "href":"#Form/Customer/" + val.name, - "value": value} - items.append(item_obj) - items.sort(key=lambda k: k['value'], reverse=True) - return items - -def get_all_items(doctype, filters, items, field, start=0, limit=20): +def get_all_items(filters, items, field, start=0, limit=20): """return all items""" + if field == "total_sales_amount": + select_field = "sum(B.amount)" + select_doctype = "`tabSales Order Item`" + if field == "total_purchase_amount": + select_field = "sum(B.amount)" + select_doctype = "`tabPurchase Order Item`" + if field == "total_sold_qty": + select_field = "sum(B.qty)" + select_doctype = "`tabSales Order Item`" + if field == "total_purchased_qty": + select_field = "sum(B.qty)" + select_doctype = "`tabPurchase Order Item`" + if field == "available_stock_qty": + select_field = "sum(B.actual_qty)" + select_doctype = "`tabBin`" + return frappe.db.sql("""select + item.name as name , {0} as value + 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) - x = frappe.get_list(doctype, filters=filters, limit_start=start, limit_page_length=limit) - for val in x: - data = frappe.db.sql('''select item_code from `tabMaterial Request Item` where item_code = %s''', (val.name), as_list=1) - requests = destructure_tuple_of_tuples(data) - data = frappe.db.sql('''select price_list_rate from `tabItem Price` where item_code = %s''', (val.name), as_list=1) - avg_price = get_avg(destructure_tuple_of_tuples(data)) - data = frappe.db.sql('''select item_code from `tabPurchase Invoice Item` where item_code = %s''', (val.name), as_list=1) - purchases = destructure_tuple_of_tuples(data) - - value = 0 - if(field=="total_request"): - value = len(requests) - elif(field=="total_purchase"): - value = len(purchases) - elif(field=="avg_price"): - value=avg_price - item_obj = {"name": val.name, - "total_request":len(requests), - "total_purchase": len(purchases), - "avg_price": get_formatted_value(avg_price), - "href":"#Form/Item/" + val.name, - "value": value} - items.append(item_obj) - - items.sort(key=lambda k: k['value'], reverse=True) - return items - -def get_all_suppliers(doctype, filters, items, field, start=0, limit=20): +def get_all_suppliers(filters, items, field, start=0, limit=20): """return all suppliers""" - x = frappe.get_list(doctype, filters=filters, limit_start=start, limit_page_length=limit) + if field == "total_purchase_amount": + select_field = "sum(purchase_order_item.base_net_amount)" + elif field == "total_item_sold_qty": + select_field = "count(purchase_order_item.name)" + elif field == "payable_amount_outstanding_amount": + 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}" + group by purchase_invoice.supplier + order by value DESC + limit {1}""".format(filters, limit), as_dict=1) - for val in x: + 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}" + group by purchase_order.supplier + order by value DESC + limit {2}""".format(select_field, filters, limit), as_dict=1) - info = get_dashboard_info(doctype, val.name) - value = 0 - if(field=="annual_billing"): - value = info["billing_this_year"] - elif(field=="total_unpaid"): - value = abs(info["total_unpaid"]) - item_obj = {"name": val.name, - "annual_billing": get_formatted_value(info["billing_this_year"]), - "total_unpaid": get_formatted_value(abs(info["total_unpaid"])), - "href":"#Form/Supplier/" + val.name, - "value": value} - items.append(item_obj) - items.sort(key=lambda k: k['value'], reverse=True) - return items - -def get_all_sales_partner(doctype, filters, items, field, start=0, limit=20): +def get_all_sales_partner(filters, items, field, start=0, limit=20): """return all sales partner""" - x = frappe.get_list(doctype, fields=["name", "commission_rate", "modified"], filters=filters, limit_start=start, limit_page_length=limit) - for val in x: - y = frappe.db.sql('''select target_qty, target_amount from `tabTarget Detail` where parent = %s''', (val.name), as_dict=1) - target_qty = sum([f["target_qty"] for f in y]) - target_amount = sum([f["target_amount"] for f in y]) + if field == "commission_rate": + select_field = "sales_partner.commission_rate" + elif field == "target_qty": + select_field = "target_detail.target_qty" + elif field == "target_amount": + select_field = "target_detail.target_amount" + elif field == "total_sales_amount": + select_field = "sum(sales_invoice.total_commission)" - value = 0 - if(field=="commission_rate"): - value = val.commission_rate - elif(field=="target_qty"): - value = target_qty - elif(field=="target_amount"): - value = target_qty - - item_obj = {"name": val.name, - "commission_rate": get_formatted_value(val.commission_rate, False), - "target_qty": target_qty, - "target_amount": get_formatted_value(target_qty), - "href":"#Form/Sales Partner/" + val.name, - "value": value} - items.append(item_obj) - - items.sort(key=lambda k: k['value'], reverse=True) - return items + return frappe.db.sql("""select sales_partner.partner_name as name, {0} as value + from + `tabSales Partner` as sales_partner inner join `tabTarget Detail` as target_detail ON sales_partner.name = target_detail.parent + inner join + `tabSales Invoice` as sales_invoice ON sales_invoice.sales_partner = sales_partner.name + where + sales_invoice.docstatus = 1 and sales_invoice.modified >= "{1}" + group by + sales_partner.partner_name + order by value DESC + limit {2}""".format(select_field, filters, limit), as_dict=1) -def destructure_tuple_of_tuples(tup_of_tup): - """return tuple(tuples) as list""" - return [y for x in tup_of_tup for y in x] +def get_all_sales_person(filters, items, field, start=0, limit=20): + """return all sales partner""" + if field == "target_qty": + select_field = "target_detail.target_qty" + elif field == "target_amount": + select_field = "target_detail.target_amount" + elif field == "total_sales_amount": + select_field = "sum(sales_team.allocated_amount)" + + return frappe.db.sql("""select sales_person.name as name, {0} as value + from + `tabSales Person` as sales_person + inner join + `tabTarget Detail` as target_detail ON sales_person.name = target_detail.parent + inner join + `tabSales Team` as sales_team ON sales_team.sales_person = sales_person.name + where sales_person.is_group = 0 and sales_team.modified >= "{1}" + group by sales_person.name + order by value DESC + limit {2}""".format(select_field,filters,limit), as_dict=1) + def get_date_from_string(seleted_timespan): """return string for ex:this week as date:string""" @@ -155,24 +165,4 @@ def get_date_from_string(seleted_timespan): else: days = -7 - return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True) - -def get_filter_list(selected_filter): - """return list of keys""" - return map((lambda y : y["field"]), filter(lambda x : not (x["field"] == "name" or x["field"] == "modified"), selected_filter)) - -def get_avg(items): - """return avg of list items""" - length = len(items) - if length > 0: - return sum(items) / length - return 0 - -def get_formatted_value(value, add_symbol=True): - """return formatted value""" - if not add_symbol: - return '{:.{pre}f}'.format(value, pre=(get_currency_precision() or 2)) - currency_precision = get_currency_precision() or 2 - company = frappe.db.get_default("company") - currency = frappe.get_doc("Company", company).default_currency or frappe.boot.sysdefaults.currency - return fmt_money(value, currency_precision, currency) + return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True) \ No newline at end of file From d4491d361fec426d8ae63daa878884491e8b59ed Mon Sep 17 00:00:00 2001 From: vishdha Date: Wed, 21 Feb 2018 09:33:35 +0530 Subject: [PATCH 2/6] [new] Filter based on company: --- .../utilities/page/leaderboard/leaderboard.js | 29 +++++++++++++-- .../utilities/page/leaderboard/leaderboard.py | 35 ++++++++++--------- 2 files changed, 46 insertions(+), 18 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index d229b59799..f6c3fc08bc 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -39,6 +39,7 @@ 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; @@ -59,12 +60,30 @@ 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) { + 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 @@ 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_doctype = doctype; me.options.selected_filter = me.filters[doctype]; me.options.selected_filter_item = me.filters[doctype][0]; @@ -116,6 +136,7 @@ frappe.Leaderboard = Class.extend({ }, get_leaderboard: function (notify, $container, start=0) { + console.log("get", notify) var me = this; frappe.call({ @@ -123,6 +144,7 @@ frappe.Leaderboard = Class.extend({ 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 @@ 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)); @@ -257,9 +280,11 @@ 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 _selected_filter = me.options.selected_filter .map(i => frappe.model.unscrub(i)); - const fields = ['name', 'value']; + const fields = ['name','value']; const html = `
@@ -274,7 +299,7 @@ frappe.Leaderboard = Class.extend({ `
- ${ col === "Name" ? ` ${val} ` : ` ${val}` + ${ col === "Name" ? ` ${val} ` : ` ${format_currency(val, currency)}` }
`); }).join("") diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py index 6db40abadb..14994ddb76 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.py +++ b/erpnext/utilities/page/leaderboard/leaderboard.py @@ -10,27 +10,28 @@ from erpnext.accounts.party import get_dashboard_info 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 @@ def get_all_customers(filters, items, field, start=0, limit=20): 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 @@ def get_all_items(filters, items, field, start=0, limit=20): 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 @@ def get_all_suppliers(filters, items, field, start=0, limit=20): 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 @@ def get_date_from_string(seleted_timespan): 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) + + From 9a64d4371efb354c548ed5fc90513e4bce63a18f Mon Sep 17 00:00:00 2001 From: vishdha Date: Wed, 21 Feb 2018 11:26:58 +0530 Subject: [PATCH 3/6] [fix] Codacy Issue --- erpnext/utilities/page/leaderboard/leaderboard.js | 15 ++++----------- erpnext/utilities/page/leaderboard/leaderboard.py | 6 ++---- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index f6c3fc08bc..860506b961 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 14994ddb76..0d580b4250 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) From e9166d7c19f288dd397b4cf1d26466efe376dc75 Mon Sep 17 00:00:00 2001 From: vishdha Date: Wed, 21 Feb 2018 15:35:36 +0530 Subject: [PATCH 4/6] [fix] Sales partner details get from sales Order and company currency details from selected company --- erpnext/utilities/page/leaderboard/leaderboard.js | 2 +- erpnext/utilities/page/leaderboard/leaderboard.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index 860506b961..36dbc629f4 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -273,7 +273,7 @@ frappe.Leaderboard = Class.extend({ get_item_html: function (item) { var me = this; - const company = frappe.defaults.get_default('Company'); + const company = me.options.selected_company const currency = frappe.get_doc(":Company", company).default_currency; const _selected_filter = me.options.selected_filter .map(i => frappe.model.unscrub(i)); diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py index 0d580b4250..9797d47ea8 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.py +++ b/erpnext/utilities/page/leaderboard/leaderboard.py @@ -115,15 +115,15 @@ def get_all_sales_partner(filters, items, field, start=0, limit=20): elif field == "target_amount": select_field = "target_detail.target_amount" elif field == "total_sales_amount": - select_field = "sum(sales_invoice.total_commission)" + select_field = "sum(sales_order.total_commission)" return frappe.db.sql("""select sales_partner.partner_name as name, {0} as value from `tabSales Partner` as sales_partner inner join `tabTarget Detail` as target_detail ON sales_partner.name = target_detail.parent inner join - `tabSales Invoice` as sales_invoice ON sales_invoice.sales_partner = sales_partner.name + `tabSales Order` as sales_order ON sales_order.sales_partner = sales_partner.name where - sales_invoice.docstatus = 1 and sales_invoice.modified >= "{1}" + sales_order.docstatus = 1 and sales_order.modified >= "{1}" group by sales_partner.partner_name order by value DESC From 09d56754ea9ff826379b35ae0626b198e46753e6 Mon Sep 17 00:00:00 2001 From: vishdha Date: Wed, 21 Feb 2018 16:10:09 +0530 Subject: [PATCH 5/6] [fix] Codacy issue --- erpnext/utilities/page/leaderboard/leaderboard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index 36dbc629f4..95102240ca 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -69,7 +69,6 @@ frappe.Leaderboard = Class.extend({ me.options.selected_company = this.value; me.make_request($container); } - }); this.timespan_select = this.page.add_select(__("Timespan"), this.timespans.map(d => { @@ -273,7 +272,7 @@ frappe.Leaderboard = Class.extend({ get_item_html: function (item) { var me = this; - const company = me.options.selected_company + const company = me.options.selected_company; const currency = frappe.get_doc(":Company", company).default_currency; const _selected_filter = me.options.selected_filter .map(i => frappe.model.unscrub(i)); From 7d862276afb4f3bfd22dd13fddef8db1abfc7d5c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 22 Feb 2018 13:59:41 +0530 Subject: [PATCH 6/6] Cleanup and fixes on leaderboard --- .../utilities/page/leaderboard/leaderboard.js | 46 ++-- .../utilities/page/leaderboard/leaderboard.py | 256 ++++++++---------- 2 files changed, 142 insertions(+), 160 deletions(-) diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js index 95102240ca..746ac79488 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.js +++ b/erpnext/utilities/page/leaderboard/leaderboard.js @@ -19,13 +19,13 @@ frappe.Leaderboard = Class.extend({ // const list of doctypes this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"]; this.timespans = ["Week", "Month", "Quarter", "Year"]; - this.desc_fields = ["total_sales_amount", "total_request","total_purchase_amount","commission_rate"]; this.filters = { - "Customer": ["total_item_purchased_qty", "total_sales_amount","receivable_amount_outstanding_amount"], - "Item": ["total_purchase_amount", "total_purchased_qty", "total_sales_amount", "total_sold_qty","available_stock_qty"], - "Supplier": ["total_item_sold_qty", "total_purchase_amount","payable_amount_outstanding_amount"], - "Sales Partner": ["commission_rate", "target_qty", "target_amount", "total_sales_amount"], - "Sales Person": ["target_qty", "target_amount", "total_sales_amount"], + "Customer": ["total_sales_amount", "total_qty_sold", "outstanding_amount", ], + "Item": ["total_sales_amount", "total_qty_sold", "total_purchase_amount", + "total_qty_purchased", "available_stock_qty", "available_stock_value"], + "Supplier": ["total_purchase_amount", "total_qty_purchased", "outstanding_amount"], + "Sales Partner": ["total_sales_amount", "total_commision"], + "Sales Person": ["total_sales_amount"], }; // for saving current selected filters @@ -65,6 +65,7 @@ frappe.Leaderboard = Class.extend({ fieldtype:'Link', options:'Company', default:frappe.defaults.get_default('company'), + reqd: 1, change: function() { me.options.selected_company = this.value; me.make_request($container); @@ -76,10 +77,6 @@ frappe.Leaderboard = Class.extend({ }) ); - - - // this.timespan_select.val(this.timespans[1]); - this.type_select = this.page.add_select(__("Type"), me.options.selected_filter.map(d => { return {"label": __(frappe.model.unscrub(d)), value: d } @@ -129,9 +126,11 @@ frappe.Leaderboard = Class.extend({ }); }, - get_leaderboard: function (notify, $container, start=0) { + get_leaderboard: function (notify, $container) { var me = this; - + if(!me.options.selected_company) { + frappe.throw(__("Please select Company")); + } frappe.call({ method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard", args: { @@ -139,7 +138,6 @@ frappe.Leaderboard = Class.extend({ timespan: me.options.selected_timespan, company: me.options.selected_company, field: me.options.selected_filter_item, - start: start }, callback: function (r) { let results = r.message || []; @@ -274,25 +272,25 @@ frappe.Leaderboard = Class.extend({ var me = this; const company = me.options.selected_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 html = `
${ - fields.map(filter => { - const col = frappe.model.unscrub(filter); - let val = item[filter]; - if (col === "Modified") { - val = comment_when(val); + fields.map(col => { + let val = item[col]; + if(col=="name") { + var formatted_value = ` ${val} ` + } else { + var formatted_value = ` + ${(me.options.selected_filter_item.indexOf('qty') == -1) ? format_currency(val, currency) : val}` } + return ( `
- ${ col === "Name" ? ` ${val} ` : ` ${format_currency(val, currency)}` - } + ${(col == "value") ? "text-right" : ""}"> + ${formatted_value}
`); }).join("") } diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py index 9797d47ea8..87cf2a43be 100644 --- a/erpnext/utilities/page/leaderboard/leaderboard.py +++ b/erpnext/utilities/page/leaderboard/leaderboard.py @@ -3,156 +3,141 @@ from __future__ import unicode_literals, print_function import frappe -import json -from operator import itemgetter -from frappe.utils import add_to_date, fmt_money -from erpnext.accounts.party import get_dashboard_info -from erpnext.accounts.utils import get_currency_precision +from frappe.utils import add_to_date @frappe.whitelist() -def get_leaderboard(doctype, timespan, company, field, start=0): +def get_leaderboard(doctype, timespan, company, field): """return top 10 items for that doctype based on conditions""" - filters = get_date_from_string(timespan) - items = [] + from_date = get_from_date(timespan) + records = [] if doctype == "Customer": - items = get_all_customers(filters, company, [], field) + records = get_all_customers(from_date, company, field) elif doctype == "Item": - items = get_all_items(filters, [], field) + records = get_all_items(from_date, company, field) elif doctype == "Supplier": - items = get_all_suppliers(filters, company, [], field) + records = get_all_suppliers(from_date, company, field) elif doctype == "Sales Partner": - items = get_all_sales_partner(filters, [], field) + records = get_all_sales_partner(from_date, company, field) elif doctype == "Sales Person": - items = get_all_sales_person(filters, [], field) + records = get_all_sales_person(from_date, company) - if len(items) > 0: - return items - return [] + return records -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)" - elif field == "total_item_purchased_qty": - select_field = "count(sales_order_item.name)" - elif field == "receivable_amount_outstanding_amount": +def get_all_customers(from_date, company, field): + if field == "outstanding_amount": 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}" and sales_invoice.company = "{1}" - group by sales_invoice.customer - order by value DESC - limit {2}""".format(filters, company, limit), as_dict=1) + select customer as name, sum(outstanding_amount) as value + FROM `tabSales Invoice` + where docstatus = 1 and posting_date >= %s and company = %s + group by customer + order by value DESC + limit 20 + """, (from_date, company), as_dict=1) + else: + if field == "total_sales_amount": + select_field = "sum(so_item.base_net_amount)" + elif field == "total_qty_sold": + select_field = "sum(so_item.stock_qty)" + + return frappe.db.sql(""" + select so.customer as name, {0} as value + FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item + ON so.name = so_item.parent + where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s + group by so.customer + order by value DESC + limit 20 + """.format(select_field), (from_date, company), as_dict=1) + +def get_all_items(from_date, company, field): + if field in ("available_stock_qty", "available_stock_value"): + return frappe.db.sql(""" + select item_code as name, {0} as value + from tabBin + group by item_code + order by value desc + limit 20 + """.format("sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)"), as_dict=1) + else: + if field == "total_sales_amount": + select_field = "sum(order_item.base_net_amount)" + select_doctype = "Sales Order" + elif field == "total_purchase_amount": + select_field = "sum(order_item.base_net_amount)" + select_doctype = "Purchase Order" + elif field == "total_qty_sold": + select_field = "sum(order_item.stock_qty)" + select_doctype = "Sales Order" + elif field == "total_qty_purchased": + select_field = "sum(order_item.stock_qty)" + select_doctype = "Purchase Order" + + return frappe.db.sql(""" + select order_item.item_code as name, {0} as value + from `tab{1}` sales_order join `tab{1} Item` as order_item + on sales_order.name = order_item.parent + where sales_order.docstatus = 1 + and sales_order.company = %s and sales_order.transaction_date >= %s + group by order_item.item_code + order by value desc + limit 20 + """.format(select_field, select_doctype), (company, from_date), as_dict=1) + +def get_all_suppliers(from_date, company, field): + if field == "outstanding_amount": + return frappe.db.sql(""" + select supplier as name, sum(outstanding_amount) as value + FROM `tabPurchase Invoice` + where docstatus = 1 and posting_date >= %s and company = %s + group by supplier + order by value DESC + limit 20""", (from_date, company), as_dict=1) + else: + if field == "total_purchase_amount": + select_field = "sum(purchase_order_item.base_net_amount)" + elif field == "total_qty_purchased": + select_field = "sum(purchase_order_item.stock_qty)" + + 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 >= %s + and purchase_order.company = %s + group by purchase_order.supplier + order by value DESC + limit 20""".format(select_field), (from_date, company), as_dict=1) + +def get_all_sales_partner(from_date, company, field): + if field == "total_sales_amount": + select_field = "sum(base_net_total)" + elif field == "total_commission": + select_field = "sum(total_commission)" 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}" and sales_order.company = "{2}" - group by sales_order.customer - order by value DESC - limit {3}""".format(select_field, filters, company, limit), as_dict=1) - - - - -def get_all_items(filters, items, field, start=0, limit=20): - """return all items""" - if field == "total_sales_amount": - select_field = "sum(B.amount)" - select_doctype = "`tabSales Order Item`" - if field == "total_purchase_amount": - select_field = "sum(B.amount)" - select_doctype = "`tabPurchase Order Item`" - if field == "total_sold_qty": - select_field = "sum(B.qty)" - select_doctype = "`tabSales Order Item`" - if field == "total_purchased_qty": - select_field = "sum(B.qty)" - select_doctype = "`tabPurchase Order Item`" - if field == "available_stock_qty": - select_field = "sum(B.actual_qty)" - select_doctype = "`tabBin`" - return frappe.db.sql("""select - item.name as name , {0} as value - 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, company, items, field, start=0, limit=20): - """return all suppliers""" - - if field == "total_purchase_amount": - select_field = "sum(purchase_order_item.base_net_amount)" - elif field == "total_item_sold_qty": - select_field = "count(purchase_order_item.name)" - elif field == "payable_amount_outstanding_amount": - 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}" and purchase_invoice.company = "{1}" - group by purchase_invoice.supplier - order by value DESC - limit {2}""".format(filters, company, limit), as_dict=1) + select sales_partner as name, {0} as value + from `tabSales Order` + where ifnull(sales_partner, '') != '' and docstatus = 1 + and transaction_date >= %s and company = %s + group by sales_partner + order by value DESC + limit 20 + """.format(select_field), (from_date, company), as_dict=1) +def get_all_sales_person(from_date, company): 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}" 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) - - - -def get_all_sales_partner(filters, items, field, start=0, limit=20): - """return all sales partner""" - - if field == "commission_rate": - select_field = "sales_partner.commission_rate" - elif field == "target_qty": - select_field = "target_detail.target_qty" - elif field == "target_amount": - select_field = "target_detail.target_amount" - elif field == "total_sales_amount": - select_field = "sum(sales_order.total_commission)" - - return frappe.db.sql("""select sales_partner.partner_name as name, {0} as value - from - `tabSales Partner` as sales_partner inner join `tabTarget Detail` as target_detail ON sales_partner.name = target_detail.parent - inner join - `tabSales Order` as sales_order ON sales_order.sales_partner = sales_partner.name - where - sales_order.docstatus = 1 and sales_order.modified >= "{1}" - group by - sales_partner.partner_name + select sales_team.sales_person as name, sum(sales_order.base_net_total) as value + from `tabSales Order` as sales_order join `tabSales Team` as sales_team + on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order' + where sales_order.docstatus = 1 + and sales_order.transaction_date >= %s + and sales_order.company = %s + group by sales_team.sales_person order by value DESC - limit {2}""".format(select_field, filters, limit), as_dict=1) + limit 20 + """, (from_date, company), as_dict=1) - -def get_all_sales_person(filters, items, field, start=0, limit=20): - """return all sales partner""" - if field == "target_qty": - select_field = "target_detail.target_qty" - elif field == "target_amount": - select_field = "target_detail.target_amount" - elif field == "total_sales_amount": - select_field = "sum(sales_team.allocated_amount)" - - return frappe.db.sql("""select sales_person.name as name, {0} as value - from - `tabSales Person` as sales_person - inner join - `tabTarget Detail` as target_detail ON sales_person.name = target_detail.parent - inner join - `tabSales Team` as sales_team ON sales_team.sales_person = sales_person.name - where sales_person.is_group = 0 and sales_team.modified >= "{1}" - group by sales_person.name - order by value DESC - limit {2}""".format(select_field,filters,limit), as_dict=1) - - -def get_date_from_string(seleted_timespan): +def get_from_date(seleted_timespan): """return string for ex:this week as date:string""" days = months = years = 0 if "month" == seleted_timespan.lower(): @@ -164,6 +149,5 @@ def get_date_from_string(seleted_timespan): else: days = -7 - return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True) - - + return add_to_date(None, years=years, months=months, days=days, + as_string=True, as_datetime=True) \ No newline at end of file