nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: formatting

Browse Source
This commit is contained in:
Afshan
2020-10-24 15:55:11 +05:30
parent 2a41b66490
commit 7e256f804a
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,10 @@ frappe.ui.form.on('Additional Salary', {
if(!frm.doc.currency) return; if(!frm.doc.currency) return;
frm.set_query("salary_component", function() { frm.set_query("salary_component", function() {
return { return {
query : "erpnext.payroll.doctype.salary_structure.salary_structure.get_earning_deduction_components", query : "erpnext.payroll.doctype.salary_structure.salary_structure.get_earning_deduction_components",
filters: {type: "earning", currency: frm.doc.currency, company: frm.doc.company} filters: {type: "earning", currency: frm.doc.currency, company: frm.doc.company}
}; };
} });
);
}, },
employee: function(frm) { employee: function(frm) {

2
erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js
View File

@@ -103,7 +103,7 @@ var calculate_all = function(doc) {
var tbl = doc.employee_benefits || []; var tbl = doc.employee_benefits || [];
var pro_rata_dispensed_amount = 0; var pro_rata_dispensed_amount = 0;
var total_amount = 0; var total_amount = 0;
if (doc.max_benefits == 0) { if (doc.max_benefits === 0) {
doc.employee_benefits = []; doc.employee_benefits = [];
} else { } else {
for(var i = 0; i < tbl.length; i++){ for(var i = 0; i < tbl.length; i++){

2
erpnext/payroll/doctype/payroll_entry/payroll_entry.js
View File

@@ -150,7 +150,7 @@ frappe.ui.form.on('Payroll Entry', {
}, },
currency: function (frm) { currency: function (frm) {
var company_currency var company_currency;
if (!frm.doc.company) { if (!frm.doc.company) {
company_currency = erpnext.get_currency(frappe.defaults.get_default("Company")); company_currency = erpnext.get_currency(frappe.defaults.get_default("Company"));
} }

1
erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
View File

@@ -8,7 +8,6 @@ import random
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate
from frappe.utils import add_months 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.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.hr.doctype.employee.test_employee import make_employee
from erpnext.payroll.doctype.salary_slip.test_salary_slip import get_salary_component_account, \ from erpnext.payroll.doctype.salary_slip.test_salary_slip import get_salary_component_account, \

6
erpnext/payroll/doctype/salary_slip/salary_slip.js
View File

@@ -198,7 +198,7 @@ var calculate_totals = function(frm) {
frappe.call({ frappe.call({
method: "set_totals", method: "set_totals",
doc: frm.doc, doc: frm.doc,
callback: function(r) { callback: function() {
frm.refresh_fields(); frm.refresh_fields();
} }
}); });
@@ -232,7 +232,7 @@ frappe.ui.form.on('Salary Detail', {
var result = data.message; var result = data.message;
frappe.model.set_value(cdt, cdn, 'condition', result.condition); frappe.model.set_value(cdt, cdn, 'condition', result.condition);
frappe.model.set_value(cdt, cdn, 'amount_based_on_formula', result.amount_based_on_formula); 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); frappe.model.set_value(cdt, cdn, 'formula', result.formula);
} }
else{ else{
@@ -254,7 +254,7 @@ frappe.ui.form.on('Salary Detail', {
amount_based_on_formula: function(frm, cdt, cdn) { amount_based_on_formula: function(frm, cdt, cdn) {
var child = locals[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); frappe.model.set_value(cdt, cdn, 'amount', null);
} }
else{ else{

2
erpnext/payroll/doctype/salary_structure/test_salary_structure.py
View File

@@ -109,7 +109,7 @@ class TestSalaryStructure(unittest.TestCase):
self.assertEqual(salary_structure_assignment.variable, 200) self.assertEqual(salary_structure_assignment.variable, 200)
def test_multi_currency_salary_structure(self): 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') sal_struct = make_salary_structure("Salary Structure Multi Currency", "Monthly", currency='USD')
self.assertEqual(sal_struct.currency, 'USD') self.assertEqual(sal_struct.currency, 'USD')