diff --git a/erpnext/payroll/doctype/additional_salary/additional_salary.js b/erpnext/payroll/doctype/additional_salary/additional_salary.js index 4b91faa22b8..4db92fa5d1b 100644 --- a/erpnext/payroll/doctype/additional_salary/additional_salary.js +++ b/erpnext/payroll/doctype/additional_salary/additional_salary.js @@ -16,11 +16,10 @@ frappe.ui.form.on('Additional Salary', { if(!frm.doc.currency) return; frm.set_query("salary_component", function() { return { - query : "erpnext.payroll.doctype.salary_structure.salary_structure.get_earning_deduction_components", - filters: {type: "earning", currency: frm.doc.currency, company: frm.doc.company} - }; - } - ); + query : "erpnext.payroll.doctype.salary_structure.salary_structure.get_earning_deduction_components", + filters: {type: "earning", currency: frm.doc.currency, company: frm.doc.company} + }; + }); }, employee: function(frm) { diff --git a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js index d24e1560fa5..8639995aca9 100644 --- a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js +++ b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js @@ -103,7 +103,7 @@ var calculate_all = function(doc) { var tbl = doc.employee_benefits || []; var pro_rata_dispensed_amount = 0; var total_amount = 0; - if (doc.max_benefits == 0) { + if (doc.max_benefits === 0) { doc.employee_benefits = []; } else { for(var i = 0; i < tbl.length; i++){ diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.js b/erpnext/payroll/doctype/payroll_entry/payroll_entry.js index 81eacb96e0d..f1cdf9daa63 100644 --- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.js +++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.js @@ -150,7 +150,7 @@ frappe.ui.form.on('Payroll Entry', { }, currency: function (frm) { - var company_currency + var company_currency; if (!frm.doc.company) { company_currency = erpnext.get_currency(frappe.defaults.get_default("Company")); } diff --git a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py index eac3e25f8bd..4c56d8b547a 100644 --- a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py +++ b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py @@ -8,7 +8,6 @@ import random from dateutil.relativedelta import relativedelta from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate from frappe.utils import add_months -from frappe.utils.make_random import get_random from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_start_end_dates, get_end_date from erpnext.hr.doctype.employee.test_employee import make_employee from erpnext.payroll.doctype.salary_slip.test_salary_slip import get_salary_component_account, \ diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.js b/erpnext/payroll/doctype/salary_slip/salary_slip.js index 843ed1de6bd..bd57b6cb88f 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.js +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.js @@ -198,7 +198,7 @@ var calculate_totals = function(frm) { frappe.call({ method: "set_totals", doc: frm.doc, - callback: function(r) { + callback: function() { frm.refresh_fields(); } }); @@ -232,7 +232,7 @@ frappe.ui.form.on('Salary Detail', { var result = data.message; frappe.model.set_value(cdt, cdn, 'condition', result.condition); frappe.model.set_value(cdt, cdn, 'amount_based_on_formula', result.amount_based_on_formula); - if(result.amount_based_on_formula == 1){ + if(result.amount_based_on_formula === 1){ frappe.model.set_value(cdt, cdn, 'formula', result.formula); } else{ @@ -254,7 +254,7 @@ frappe.ui.form.on('Salary Detail', { amount_based_on_formula: function(frm, cdt, cdn) { var child = locals[cdt][cdn]; - if(child.amount_based_on_formula == 1){ + if(child.amount_based_on_formula === 1){ frappe.model.set_value(cdt, cdn, 'amount', null); } else{ diff --git a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py index 822512ea4e2..2cddfa8cc8a 100644 --- a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py +++ b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py @@ -109,7 +109,7 @@ class TestSalaryStructure(unittest.TestCase): self.assertEqual(salary_structure_assignment.variable, 200) def test_multi_currency_salary_structure(self): - emp = make_employee("test_muti_currency_employee@salary.com") + make_employee("test_muti_currency_employee@salary.com") sal_struct = make_salary_structure("Salary Structure Multi Currency", "Monthly", currency='USD') self.assertEqual(sal_struct.currency, 'USD')