From 6e4b94f265a01ec8d99070d8a435467b310fc673 Mon Sep 17 00:00:00 2001 From: Afshan Date: Wed, 27 Oct 2021 16:18:46 +0530 Subject: [PATCH] fix: clear contribution table on reselection of sales person --- erpnext/payroll/doctype/sales_commission/sales_commission.js | 5 +++++ erpnext/payroll/doctype/sales_commission/sales_commission.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/payroll/doctype/sales_commission/sales_commission.js b/erpnext/payroll/doctype/sales_commission/sales_commission.js index ef7775ced7f..10d76cce69d 100644 --- a/erpnext/payroll/doctype/sales_commission/sales_commission.js +++ b/erpnext/payroll/doctype/sales_commission/sales_commission.js @@ -18,6 +18,11 @@ frappe.ui.form.on('Sales Commission', { } }, + sales_person: function (frm) { + frm.clear_table('contributions'); + frm.refresh(); + }, + get_contributions: function (frm) { frm.clear_table("contributions"); return frappe.call({ diff --git a/erpnext/payroll/doctype/sales_commission/sales_commission.py b/erpnext/payroll/doctype/sales_commission/sales_commission.py index 6709f572864..9aa5d6d7dc2 100644 --- a/erpnext/payroll/doctype/sales_commission/sales_commission.py +++ b/erpnext/payroll/doctype/sales_commission/sales_commission.py @@ -10,7 +10,7 @@ from frappe.utils import get_link_to_form class SalesCommission(Document): def validate(self): self.validate_from_to_dates() - self.validate_amount() + self.validate_salary_component() self.calculate_total_contribution_and_total_commission_amount() @@ -27,6 +27,7 @@ class SalesCommission(Document): frappe.throw(_("Please set {0} in {1}").format(frappe.bold("Salary Component for Sales Commission"), get_link_to_form("Payroll Settings", "Payroll Settings"))) def on_submit(self): + self.validate_amount() self.db_set("status", "Unpaid") @frappe.whitelist()