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

[fix] Sales partner details get from sales Order and company currency details from selected company

Browse Source
This commit is contained in:
vishdha 2018-02-21 15:35:36 +05:30
parent 9a64d4371e
commit e9166d7c19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));

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

@ -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