nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48812 from frappe/mergify/bp/version-15-hotfix/pr-48480

Browse Source 
Currency sales partner commision report (backport #48480)
This commit is contained in:
ruthra kumar
2025-07-28 17:29:32 +05:30
committed by GitHub
parent 9b59fb659b 8d25269de6
commit 794fac12a4
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js
View File

@@ -3,6 +3,14 @@
frappe.query_reports["Sales Partner Commission Summary"] = {
filters: [
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
reqd: 1,
},
{
fieldname: "sales_partner",
label: __("Sales Partner"),
@@ -28,13 +36,6 @@ frappe.query_reports["Sales Partner Commission Summary"] = {
fieldtype: "Date",
default: frappe.datetime.get_today(),
},
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
},
{
fieldname: "customer",
label: __("Customer"),

21
erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py
View File

@@ -35,6 +35,12 @@ def get_columns(filters):
"fieldtype": "Link",
"width": 140,
},
{
"label": _("Currency"),
"fieldname": "currency",
"fieldtype": "Data",
"width": 80,
},
{
"label": _("Territory"),
"options": "Territory",
@@ -43,7 +49,13 @@ def get_columns(filters):
"width": 100,
},
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100},
{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
{
"label": _("Amount"),
"fieldname": "amount",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
},
{
"label": _("Sales Partner"),
"options": "Sales Partner",
@@ -61,6 +73,7 @@ def get_columns(filters):
"label": _("Total Commission"),
"fieldname": "total_commission",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
},
]
@@ -70,19 +83,19 @@ def get_columns(filters):
def get_entries(filters):
date_field = "transaction_date" if filters.get("doctype") == "Sales Order" else "posting_date"
company_currency = frappe.db.get_value("Company", filters.get("company"), "default_currency")
conditions = get_conditions(filters, date_field)
entries = frappe.db.sql(
"""
SELECT
name, customer, territory, {} as posting_date, base_net_total as amount,
sales_partner, commission_rate, total_commission
sales_partner, commission_rate, total_commission, '{}' as currency
FROM
`tab{}`
WHERE
{} and docstatus = 1 and sales_partner is not null
and sales_partner != '' order by name desc, sales_partner
""".format(date_field, filters.get("doctype"), conditions),
""".format(date_field, company_currency, filters.get("doctype"), conditions),
filters,
as_dict=1,
)