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

fix: linting issues

Browse Source
This commit is contained in:
Afshan
2021-09-30 19:46:09 +05:30
parent 0196ab56e8
commit a5de9a3909
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/payroll/doctype/process_sales_commission/test_process_sales_commission.py
View File

@@ -16,7 +16,6 @@ from erpnext.payroll.doctype.sales_commission.test_sales_commission import (
make_salary_structure, make_salary_structure,
make_sales_person, make_sales_person,
make_so, make_so,
salary_structure,
sales_commission_component, sales_commission_component,
setup_test, setup_test,
) )

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

@@ -23,10 +23,11 @@ frappe.ui.form.on('Sales Commission', {
return frappe.call({ return frappe.call({
doc: frm.doc, doc: frm.doc,
method: 'add_contributions', method: 'add_contributions',
}).then(r => { callback: function () {
frm.dirty(); frm.dirty();
frm.save(); frm.save();
frm.refresh(); frm.refresh();
},
}); });
}, },

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

@@ -32,14 +32,14 @@ class SalesCommission(Document):
if add(record, self.sales_person): 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) record_details = frappe.db.get_value(self.commission_based_on, filters={"name": record["parent"]}, fieldname=["customer", filter_date], as_dict=True)
contribution = { contribution = {
"document_type": self.commission_based_on, "document_type": self.commission_based_on,
"order_or_invoice": record["parent"], "order_or_invoice": record["parent"],
"customer": record_details["customer"], "customer": record_details["customer"],
"posting_date": record_details[filter_date], "posting_date": record_details[filter_date],
"contribution_percent": record["allocated_percentage"], "contribution_percent": record["allocated_percentage"],
"contribution_amount": record["allocated_amount"], "contribution_amount": record["allocated_amount"],
"commission_rate": record["commission_rate"], "commission_rate": record["commission_rate"],
"commission_amount": record["incentives"], "commission_amount": record["incentives"],
} }
self.append("contributions", contribution) self.append("contributions", contribution)
self.calculate_total_contribution_and_total_commission_amount() self.calculate_total_contribution_and_total_commission_amount()
@@ -119,7 +119,7 @@ class SalesCommission(Document):
doc.append("references", reference) doc.append("references", reference)
def add(record, sales_person): 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: if previous_contibutions:
for contributions in previous_contibutions: for contributions in previous_contibutions:
if frappe.db.get_value("Sales Commission", {"name":contributions["parent"]}, fieldname=["sales_person"]) == sales_person: if frappe.db.get_value("Sales Commission", {"name":contributions["parent"]}, fieldname=["sales_person"]) == sales_person:

12
erpnext/payroll/doctype/sales_commission/test_sales_commission.py
View File

@@ -60,7 +60,7 @@ class TestSalesCommission(unittest.TestCase):
sc.submit() sc.submit()
sc.payout_entry() 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: for entry in add_sal:
if frappe.get_value("Additional Salary", filters={"name": entry["name"]}, fieldname=["employee"]) == sc.employee: if frappe.get_value("Additional Salary", filters={"name": entry["name"]}, fieldname=["employee"]) == sc.employee:
add_sal_doc = frappe.get_doc("Additional Salary", entry['name']) add_sal_doc = frappe.get_doc("Additional Salary", entry['name'])
@@ -193,9 +193,9 @@ def make_sales_person(emp, emp_name):
sales_person.insert() sales_person.insert()
def make_so(emp_name): def make_so(emp_name):
so = make_sales_order(do_not_save=1) so = make_sales_order(do_not_save=1)
add_sales_person(so, emp_name) add_sales_person(so, emp_name)
so.transaction_date = add_to_date(getdate(), days=-1) so.transaction_date = add_to_date(getdate(), days=-1)
so.submit() so.submit()
return so return so