Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Salary structure assignment in tests

Browse Source
This commit is contained in:
Deepesh Garg 2020-12-30 15:47:22 +05:30
parent 97d055dfc3
commit 66dcaf3ab2
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/payroll/doctype/income_tax_slab/income_tax_slab.py
View File

@ -3,7 +3,7 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe #import frappe
import erpnext import erpnext
from frappe.model.document import Document from frappe.model.document import Document

20
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@ -9,7 +9,7 @@ import calendar
import random import random
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
from frappe.utils.make_random import get_random from frappe.utils.make_random import get_random
from frappe.utils import getdate, nowdate, add_days, add_months, flt, get_first_day, get_last_day from frappe.utils import getdate, nowdate, add_days, add_months, flt, get_first_day, get_last_day, cstr
from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_month_details from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_month_details
from erpnext.hr.doctype.employee.test_employee import make_employee from erpnext.hr.doctype.employee.test_employee import make_employee
@ -240,8 +240,7 @@ class TestSalarySlip(unittest.TestCase):
interest_income_account='Interest Income Account - _TC', interest_income_account='Interest Income Account - _TC',
penalty_income_account='Penalty Income Account - _TC') penalty_income_account='Penalty Income Account - _TC')
payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company", payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company")
start_date=getdate("2019-04-01"), end_date=getdate("2020-03-31"))
make_salary_structure("Test Loan Repayment Salary Structure", "Monthly", employee=applicant, currency='INR', make_salary_structure("Test Loan Repayment Salary Structure", "Monthly", employee=applicant, currency='INR',
payroll_period=payroll_period) payroll_period=payroll_period)
@ -300,8 +299,7 @@ class TestSalarySlip(unittest.TestCase):
applicant = make_employee("test_ytd@salary.com", company="_Test Company") applicant = make_employee("test_ytd@salary.com", company="_Test Company")
payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company", payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company")
start_date=getdate("2019-04-01"), end_date=getdate("2020-03-31"))
create_tax_slab(payroll_period, allow_tax_exemption=True, currency="INR", effective_date=getdate("2019-04-01"), create_tax_slab(payroll_period, allow_tax_exemption=True, currency="INR", effective_date=getdate("2019-04-01"),
company="_Test Company") company="_Test Company")
@ -666,6 +664,9 @@ def create_tax_slab(payroll_period, effective_date = None, allow_tax_exemption =
if not currency: if not currency:
currency = erpnext.get_default_currency() currency = erpnext.get_default_currency()
if company:
currency = erpnext.get_company_currency(company)
slabs = [ slabs = [
{ {
"from_amount": 250000, "from_amount": 250000,
@ -684,15 +685,12 @@ def create_tax_slab(payroll_period, effective_date = None, allow_tax_exemption =
} }
] ]
income_tax_slab_name = frappe.db.get_value("Income Tax Slab", "Tax Slab: " + payroll_period.name) income_tax_slab_name = frappe.db.get_value("Income Tax Slab", {"currency": currency})
if not income_tax_slab_name: if not income_tax_slab_name:
income_tax_slab = frappe.new_doc("Income Tax Slab") income_tax_slab = frappe.new_doc("Income Tax Slab")
income_tax_slab.name = "Tax Slab: " + payroll_period.name income_tax_slab.name = "Tax Slab: " + payroll_period.name + " " + cstr(currency)
income_tax_slab.effective_from = effective_date or add_days(payroll_period.start_date, -2) income_tax_slab.effective_from = effective_date or add_days(payroll_period.start_date, -2)
income_tax_slab.company = company or ''
if company:
income_tax_slab.company = company
income_tax_slab.currency = currency income_tax_slab.currency = currency
if allow_tax_exemption: if allow_tax_exemption: