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

Cleanup and fixes on leaderboard

Browse Source
This commit is contained in:
Nabin Hait 2018-02-22 13:59:41 +05:30
parent e4fe2d9603
commit 7d862276af
2 changed files with 142 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
erpnext/utilities/page/leaderboard/leaderboard.js
View File

@ -19,13 +19,13 @@ frappe.Leaderboard = Class.extend({
// const list of doctypes // const list of doctypes
this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"]; this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"];
this.timespans = ["Week", "Month", "Quarter", "Year"]; this.timespans = ["Week", "Month", "Quarter", "Year"];
this.desc_fields = ["total_sales_amount", "total_request","total_purchase_amount","commission_rate"];
this.filters = { this.filters = {
"Customer": ["total_item_purchased_qty", "total_sales_amount","receivable_amount_outstanding_amount"], "Customer": ["total_sales_amount", "total_qty_sold", "outstanding_amount", ],
"Item": ["total_purchase_amount", "total_purchased_qty", "total_sales_amount", "total_sold_qty","available_stock_qty"], "Item": ["total_sales_amount", "total_qty_sold", "total_purchase_amount",
"Supplier": ["total_item_sold_qty", "total_purchase_amount","payable_amount_outstanding_amount"], "total_qty_purchased", "available_stock_qty", "available_stock_value"],
"Sales Partner": ["commission_rate", "target_qty", "target_amount", "total_sales_amount"], "Supplier": ["total_purchase_amount", "total_qty_purchased", "outstanding_amount"],
"Sales Person": ["target_qty", "target_amount", "total_sales_amount"], "Sales Partner": ["total_sales_amount", "total_commision"],
"Sales Person": ["total_sales_amount"],
}; };
// for saving current selected filters // for saving current selected filters
@ -65,6 +65,7 @@ frappe.Leaderboard = Class.extend({
fieldtype:'Link', fieldtype:'Link',
options:'Company', options:'Company',
default:frappe.defaults.get_default('company'), default:frappe.defaults.get_default('company'),
reqd: 1,
change: function() { change: function() {
me.options.selected_company = this.value; me.options.selected_company = this.value;
me.make_request($container); 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"), this.type_select = this.page.add_select(__("Type"),
me.options.selected_filter.map(d => { me.options.selected_filter.map(d => {
return {"label": __(frappe.model.unscrub(d)), value: 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; var me = this;
if(!me.options.selected_company) {
frappe.throw(__("Please select Company"));
}
frappe.call({ frappe.call({
method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard", method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard",
args: { args: {
@ -139,7 +138,6 @@ frappe.Leaderboard = Class.extend({
timespan: me.options.selected_timespan, timespan: me.options.selected_timespan,
company: me.options.selected_company, company: me.options.selected_company,
field: me.options.selected_filter_item, field: me.options.selected_filter_item,
start: start
}, },
callback: function (r) { callback: function (r) {
let results = r.message || []; let results = r.message || [];
@ -274,25 +272,25 @@ frappe.Leaderboard = Class.extend({
var me = this; 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 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 = const html =
`<div class="list-item"> `<div class="list-item">
${ ${
fields.map(filter => { fields.map(col => {
const col = frappe.model.unscrub(filter); let val = item[col];
let val = item[filter]; if(col=="name") {
if (col === "Modified") { var formatted_value = `<a class="grey list-id ellipsis"
val = comment_when(val); href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>`
} else {
var formatted_value = `<span class="text-muted ellipsis">
${(me.options.selected_filter_item.indexOf('qty') == -1) ? format_currency(val, currency) : val}</span>`
} }
return ( return (
`<div class="list-item_content ellipsis list-item__content--flex-2 `<div class="list-item_content ellipsis list-item__content--flex-2
${(col !== "Name" && col !== "Modified") ? "hidden-xs" : ""} ${(col == "value") ? "text-right" : ""}">
${(filter == "value") ? "text-right" : ""}"> ${formatted_value}
${ 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>`); </div>`);
}).join("") }).join("")
} }

222
erpnext/utilities/page/leaderboard/leaderboard.py
View File

@ -3,156 +3,141 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
import frappe import frappe
import json from frappe.utils import add_to_date
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
@frappe.whitelist() @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""" """return top 10 items for that doctype based on conditions"""
filters = get_date_from_string(timespan) from_date = get_from_date(timespan)
items = [] records = []
if doctype == "Customer": if doctype == "Customer":
items = get_all_customers(filters, company, [], field) records = get_all_customers(from_date, company, field)
elif doctype == "Item": elif doctype == "Item":
items = get_all_items(filters, [], field) records = get_all_items(from_date, company, field)
elif doctype == "Supplier": elif doctype == "Supplier":
items = get_all_suppliers(filters, company, [], field) records = get_all_suppliers(from_date, company, field)
elif doctype == "Sales Partner": elif doctype == "Sales Partner":
items = get_all_sales_partner(filters, [], field) records = get_all_sales_partner(from_date, company, field)
elif doctype == "Sales Person": elif doctype == "Sales Person":
items = get_all_sales_person(filters, [], field) records = get_all_sales_person(from_date, company)
if len(items) > 0: return records
return items
return []
def get_all_customers(filters, company, items, field, start=0, limit=20): def get_all_customers(from_date, company, field):
"""return all customers""" if field == "outstanding_amount":
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(""" return frappe.db.sql("""
select sales_invoice.customer as name, sum(sales_invoice.outstanding_amount) as value select customer as name, sum(outstanding_amount) as value
FROM `tabSales Invoice` as sales_invoice FROM `tabSales Invoice`
where sales_invoice.docstatus = 1 and sales_invoice.modified >= "{0}" and sales_invoice.company = "{1}" where docstatus = 1 and posting_date >= %s and company = %s
group by sales_invoice.customer group by customer
order by value DESC order by value DESC
limit {2}""".format(filters, company, limit), as_dict=1) 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(""" return frappe.db.sql("""
select sales_order.customer as name, {0} as value select so.customer as name, {0} as value
FROM `tabSales Order` as sales_order LEFT JOIN `tabSales Order Item` FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
as sales_order_item ON sales_order.name = sales_order_item.parent ON so.name = so_item.parent
where sales_order.docstatus = 1 and sales_order.modified >= "{1}" and sales_order.company = "{2}" where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s
group by sales_order.customer group by so.customer
order by value DESC order by value DESC
limit {3}""".format(select_field, filters, company, limit), as_dict=1) 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("""
def get_all_items(filters, items, field, start=0, limit=20): select item_code as name, {0} as value
"""return all items""" 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": if field == "total_sales_amount":
select_field = "sum(B.amount)" select_field = "sum(order_item.base_net_amount)"
select_doctype = "`tabSales Order Item`" select_doctype = "Sales Order"
if field == "total_purchase_amount": elif field == "total_purchase_amount":
select_field = "sum(B.amount)" select_field = "sum(order_item.base_net_amount)"
select_doctype = "`tabPurchase Order Item`" select_doctype = "Purchase Order"
if field == "total_sold_qty": elif field == "total_qty_sold":
select_field = "sum(B.qty)" select_field = "sum(order_item.stock_qty)"
select_doctype = "`tabSales Order Item`" select_doctype = "Sales Order"
if field == "total_purchased_qty": elif field == "total_qty_purchased":
select_field = "sum(B.qty)" select_field = "sum(order_item.stock_qty)"
select_doctype = "`tabPurchase Order Item`" select_doctype = "Purchase Order"
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 frappe.db.sql("""
"""return all suppliers""" 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": if field == "total_purchase_amount":
select_field = "sum(purchase_order_item.base_net_amount)" select_field = "sum(purchase_order_item.base_net_amount)"
elif field == "total_item_sold_qty": elif field == "total_qty_purchased":
select_field = "count(purchase_order_item.name)" select_field = "sum(purchase_order_item.stock_qty)"
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)
return frappe.db.sql(""" return frappe.db.sql("""
select purchase_order.supplier as name, {0} as value select purchase_order.supplier as name, {0} as value
FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item` FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
as purchase_order_item ON purchase_order.name = purchase_order_item.parent 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}" where purchase_order.docstatus = 1 and purchase_order.modified >= %s
and purchase_order.company = %s
group by purchase_order.supplier group by purchase_order.supplier
order by value DESC order by value DESC
limit {3}""".format(select_field, filters, company, limit), as_dict=1) 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("""
def get_all_sales_partner(filters, items, field, start=0, limit=20): select sales_partner as name, {0} as value
"""return all sales partner""" from `tabSales Order`
where ifnull(sales_partner, '') != '' and docstatus = 1
if field == "commission_rate": and transaction_date >= %s and company = %s
select_field = "sales_partner.commission_rate" group by sales_partner
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
order by value DESC order by value DESC
limit {2}""".format(select_field, filters, limit), as_dict=1) limit 20
""".format(select_field), (from_date, company), as_dict=1)
def get_all_sales_person(from_date, company):
def get_all_sales_person(filters, items, field, start=0, limit=20): return frappe.db.sql("""
"""return all sales partner""" select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
if field == "target_qty": from `tabSales Order` as sales_order join `tabSales Team` as sales_team
select_field = "target_detail.target_qty" on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
elif field == "target_amount": where sales_order.docstatus = 1
select_field = "target_detail.target_amount" and sales_order.transaction_date >= %s
elif field == "total_sales_amount": and sales_order.company = %s
select_field = "sum(sales_team.allocated_amount)" group by sales_team.sales_person
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 order by value DESC
limit {2}""".format(select_field,filters,limit), as_dict=1) limit 20
""", (from_date, company), as_dict=1)
def get_from_date(seleted_timespan):
def get_date_from_string(seleted_timespan):
"""return string for ex:this week as date:string""" """return string for ex:this week as date:string"""
days = months = years = 0 days = months = years = 0
if "month" == seleted_timespan.lower(): if "month" == seleted_timespan.lower():
@ -164,6 +149,5 @@ def get_date_from_string(seleted_timespan):
else: else:
days = -7 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)