diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index 9f46d50e588..99d8a8317cd 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -1163,7 +1163,7 @@ class SalarySlip(TransactionBase): 'end_date' : ['<', self.start_date] }) - year_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0 + month_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0 month_to_date += self.net_pay self.month_to_date = month_to_date diff --git a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py index 2b249c7a197..f2fb558a14b 100644 --- a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py +++ b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py @@ -155,7 +155,10 @@ def create_salary_structure_assignment(employee, salary_structure, from_date=Non if not payroll_period: payroll_period = create_payroll_period() - income_tax_slab = create_tax_slab(payroll_period, allow_tax_exemption=True, currency=currency) + income_tax_slab = frappe.db.get_value("Income Tax Slab", {"currency": currency}) + + if not income_tax_slab: + income_tax_slab = create_tax_slab(payroll_period, allow_tax_exemption=True, currency=currency) salary_structure_assignment = frappe.new_doc("Salary Structure Assignment") salary_structure_assignment.employee = employee