mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 00:44:45 +00:00
chore: mass trailing whitespace and EOF fixes
This commit is contained in:
@@ -27,7 +27,7 @@ class TestAdditionalSalary(unittest.TestCase):
|
||||
frappe.db.set_value("Employee", emp_id, "relieving_date", add_days(nowdate(), 1800))
|
||||
salary_structure = make_salary_structure("Test Salary Structure Additional Salary", "Monthly", employee=emp_id)
|
||||
add_sal = get_additional_salary(emp_id)
|
||||
|
||||
|
||||
ss = make_employee_salary_slip("test_additional@salary.com", "Monthly", salary_structure=salary_structure.name)
|
||||
for earning in ss.earnings:
|
||||
if earning.salary_component == "Recurring Salary Component":
|
||||
|
||||
@@ -253,4 +253,4 @@ def get_earning_components_max_benefits(employee, date, earning_component):
|
||||
order by name
|
||||
""", salary_structure, earning_component)
|
||||
|
||||
return amount if amount else 0
|
||||
return amount if amount else 0
|
||||
|
||||
@@ -13,4 +13,4 @@ class EmployeeTaxExemptionSubCategory(Document):
|
||||
category_max_amount = frappe.db.get_value("Employee Tax Exemption Category", self.exemption_category, "max_amount")
|
||||
if flt(self.max_amount) > flt(category_max_amount):
|
||||
frappe.throw(_("Max Exemption Amount cannot be greater than maximum exemption amount {0} of Tax Exemption Category {1}")
|
||||
.format(category_max_amount, self.exemption_category))
|
||||
.format(category_max_amount, self.exemption_category))
|
||||
|
||||
@@ -69,4 +69,4 @@ frappe.ui.form.on('Gratuity', {
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
@@ -246,4 +246,3 @@ def get_last_salary_slip(employee):
|
||||
"employee": employee, 'docstatus': 1
|
||||
},
|
||||
order_by = "start_date desc")[0].name
|
||||
|
||||
|
||||
@@ -17,4 +17,4 @@ def get_data():
|
||||
'items': ['Additional Salary']
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,4 +37,4 @@ frappe.ui.form.on('Gratuity Rule Slab', {
|
||||
frappe.throw(__("To(Year) year can not be less than From(year) "));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -10,4 +10,4 @@ def get_data():
|
||||
'items': ['Gratuity']
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,4 +13,4 @@ def get_data():
|
||||
'items': ['Salary Slip', 'Journal Entry']
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,4 +9,4 @@ def get_data():
|
||||
'items': ['Employee Tax Exemption Proof Submission', 'Employee Tax Exemption Declaration']
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,4 +52,4 @@ QUnit.test("test salary slip", function(assert) {
|
||||
() => frappe.click_button('Yes'),
|
||||
() => done()
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
<pre><code>Condition: annual_taxable_earning > 20000000</code></pre>
|
||||
<pre><code>Formula: annual_taxable_earning * 0.10 </code></pre>
|
||||
</li>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
@@ -206,4 +206,3 @@ def get_employees(salary_structure):
|
||||
salary_structure, salary_structure))
|
||||
|
||||
return list(set([d.employee for d in employees]))
|
||||
|
||||
|
||||
@@ -15,4 +15,4 @@ def get_data():
|
||||
'items': ['Employee Grade']
|
||||
},
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ class SalaryStructureAssignment(Document):
|
||||
def validate_income_tax_slab(self):
|
||||
if not self.income_tax_slab:
|
||||
return
|
||||
|
||||
|
||||
income_tax_slab_currency = frappe.db.get_value('Income Tax Slab', self.income_tax_slab, 'currency')
|
||||
if self.currency != income_tax_slab_currency:
|
||||
frappe.throw(_("Currency of selected Income Tax Slab should be {0} instead of {1}").format(self.currency, income_tax_slab_currency))
|
||||
@@ -69,4 +69,4 @@ def get_employee_currency(employee):
|
||||
employee_currency = frappe.db.get_value('Salary Structure Assignment', {'employee': employee}, 'currency')
|
||||
if not employee_currency:
|
||||
frappe.throw(_("There is no Salary Structure assigned to {0}. First assign a Salary Stucture.").format(employee))
|
||||
return employee_currency
|
||||
return employee_currency
|
||||
|
||||
@@ -1 +1 @@
|
||||
update from `tabNotification` set module='Payroll' where name = "Retention Bonus"
|
||||
update from `tabNotification` set module='Payroll' where name = "Retention Bonus"
|
||||
|
||||
@@ -25,4 +25,3 @@ frappe.query_reports["Bank Remittance"] = {
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
frappe.require("assets/erpnext/js/salary_slip_deductions_report_filters.js", function() {
|
||||
frappe.query_reports["Income Tax Deductions"] = erpnext.salary_slip_deductions_report_filters;
|
||||
});
|
||||
});
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
frappe.require("assets/erpnext/js/salary_slip_deductions_report_filters.js", function() {
|
||||
frappe.query_reports["Salary Payments Based On Payment Mode"] = erpnext.salary_slip_deductions_report_filters;
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user