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

fix: clear contribution table on reselection of sales person

Browse Source
This commit is contained in:
Afshan
2021-10-27 16:18:46 +05:30
parent 63e0a174c0
commit e1ec223ee5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/payroll/doctype/sales_commission/sales_commission.js
View File

@@ -18,6 +18,11 @@ frappe.ui.form.on('Sales Commission', {
} }
}, },
sales_person: function (frm) {
frm.clear_table('contributions');
frm.refresh();
},
get_contributions: function (frm) { get_contributions: function (frm) {
frm.clear_table("contributions"); frm.clear_table("contributions");
return frappe.call({ return frappe.call({

3
erpnext/payroll/doctype/sales_commission/sales_commission.py
View File

@@ -10,7 +10,7 @@ from frappe.utils import get_link_to_form
class SalesCommission(Document): class SalesCommission(Document):
def validate(self): def validate(self):
self.validate_from_to_dates() self.validate_from_to_dates()
self.validate_amount()
self.validate_salary_component() self.validate_salary_component()
self.calculate_total_contribution_and_total_commission_amount() 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"))) 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): def on_submit(self):
self.validate_amount()
self.db_set("status", "Unpaid") self.db_set("status", "Unpaid")
@frappe.whitelist() @frappe.whitelist()