From 303af52e1c13ea83186fa06844f8eb0cdfab475d Mon Sep 17 00:00:00 2001 From: Afshan Date: Thu, 30 Sep 2021 19:46:09 +0530 Subject: [PATCH] fix: linting issues --- .../test_process_sales_commission.py | 1 - .../sales_commission/sales_commission.js | 9 +++++---- .../sales_commission/sales_commission.py | 18 +++++++++--------- .../sales_commission/test_sales_commission.py | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/erpnext/payroll/doctype/process_sales_commission/test_process_sales_commission.py b/erpnext/payroll/doctype/process_sales_commission/test_process_sales_commission.py index 1a20305c473..5cee9fe61b8 100644 --- a/erpnext/payroll/doctype/process_sales_commission/test_process_sales_commission.py +++ b/erpnext/payroll/doctype/process_sales_commission/test_process_sales_commission.py @@ -16,7 +16,6 @@ from erpnext.payroll.doctype.sales_commission.test_sales_commission import ( make_salary_structure, make_sales_person, make_so, - salary_structure, sales_commission_component, setup_test, ) diff --git a/erpnext/payroll/doctype/sales_commission/sales_commission.js b/erpnext/payroll/doctype/sales_commission/sales_commission.js index 93352805039..ef7775ced7f 100644 --- a/erpnext/payroll/doctype/sales_commission/sales_commission.js +++ b/erpnext/payroll/doctype/sales_commission/sales_commission.js @@ -23,10 +23,11 @@ frappe.ui.form.on('Sales Commission', { return frappe.call({ doc: frm.doc, method: 'add_contributions', - }).then(r => { - frm.dirty(); - frm.save(); - frm.refresh(); + callback: function () { + frm.dirty(); + frm.save(); + frm.refresh(); + }, }); }, diff --git a/erpnext/payroll/doctype/sales_commission/sales_commission.py b/erpnext/payroll/doctype/sales_commission/sales_commission.py index da2aebfe5ff..52ba8f3d9c2 100644 --- a/erpnext/payroll/doctype/sales_commission/sales_commission.py +++ b/erpnext/payroll/doctype/sales_commission/sales_commission.py @@ -32,14 +32,14 @@ class SalesCommission(Document): if add(record, self.sales_person): record_details = frappe.db.get_value(self.commission_based_on, filters={"name": record["parent"]}, fieldname=["customer", filter_date], as_dict=True) contribution = { - "document_type": self.commission_based_on, - "order_or_invoice": record["parent"], - "customer": record_details["customer"], - "posting_date": record_details[filter_date], - "contribution_percent": record["allocated_percentage"], - "contribution_amount": record["allocated_amount"], - "commission_rate": record["commission_rate"], - "commission_amount": record["incentives"], + "document_type": self.commission_based_on, + "order_or_invoice": record["parent"], + "customer": record_details["customer"], + "posting_date": record_details[filter_date], + "contribution_percent": record["allocated_percentage"], + "contribution_amount": record["allocated_amount"], + "commission_rate": record["commission_rate"], + "commission_amount": record["incentives"], } self.append("contributions", contribution) self.calculate_total_contribution_and_total_commission_amount() @@ -119,7 +119,7 @@ class SalesCommission(Document): doc.append("references", reference) def add(record, sales_person): - previous_contibutions = frappe.get_all("Contributions", filters={"order_or_invoice":record["parent"], "docstatus":["!=", 2]}, fields=["parent"]) + previous_contibutions = frappe.get_all("Contributions", filters={"order_or_invoice":record["parent"], "docstatus":["!=", 2]}, fields=["parent"]) if previous_contibutions: for contributions in previous_contibutions: if frappe.db.get_value("Sales Commission", {"name":contributions["parent"]}, fieldname=["sales_person"]) == sales_person: diff --git a/erpnext/payroll/doctype/sales_commission/test_sales_commission.py b/erpnext/payroll/doctype/sales_commission/test_sales_commission.py index c6d402c4c20..b13de4c862f 100644 --- a/erpnext/payroll/doctype/sales_commission/test_sales_commission.py +++ b/erpnext/payroll/doctype/sales_commission/test_sales_commission.py @@ -60,7 +60,7 @@ class TestSalesCommission(unittest.TestCase): sc.submit() sc.payout_entry() - add_sal = frappe.get_all("Additional Salary", filters={"ref_docname": sc.name}) + add_sal = frappe.get_all("Additional Salary", filters={"ref_docname": sc.name}) for entry in add_sal: if frappe.get_value("Additional Salary", filters={"name": entry["name"]}, fieldname=["employee"]) == sc.employee: add_sal_doc = frappe.get_doc("Additional Salary", entry['name']) @@ -193,9 +193,9 @@ def make_sales_person(emp, emp_name): sales_person.insert() def make_so(emp_name): - so = make_sales_order(do_not_save=1) - add_sales_person(so, emp_name) - so.transaction_date = add_to_date(getdate(), days=-1) - so.submit() + so = make_sales_order(do_not_save=1) + add_sales_person(so, emp_name) + so.transaction_date = add_to_date(getdate(), days=-1) + so.submit() - return so \ No newline at end of file + return so \ No newline at end of file