-
Notifications
You must be signed in to change notification settings - Fork 656
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1719 from frappe/version-15-hotfix
chore: release v15
- Loading branch information
Showing
4 changed files
with
53 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,7 +132,8 @@ def test_india_hra_exemption(self): | |
frappe.flags.country = "India" | ||
|
||
employee = frappe.get_value("Employee", {"user_id": "[email protected]"}, "name") | ||
setup_hra_exemption_prerequisites("Monthly", employee) | ||
# structure assigned before payroll period should still be considered as active | ||
setup_hra_exemption_prerequisites("Monthly", employee, from_date=add_months(PAYROLL_PERIOD_START, -1)) | ||
|
||
declaration = frappe.get_doc( | ||
{ | ||
|
@@ -321,7 +322,7 @@ def test_india_hra_exemption_with_bimonthly_payroll_frequency(self): | |
# reset | ||
frappe.flags.country = current_country | ||
|
||
def test_india_hra_exemption_with_multiple_salary_structure_assignments(self): | ||
def test_india_hra_exemption_with_multiple_assignments(self): | ||
from hrms.payroll.doctype.salary_slip.test_salary_slip import create_tax_slab | ||
from hrms.payroll.doctype.salary_structure.test_salary_structure import ( | ||
create_salary_structure_assignment, | ||
|
@@ -471,7 +472,7 @@ def create_exemption_category(): | |
).insert() | ||
|
||
|
||
def setup_hra_exemption_prerequisites(frequency, employee=None): | ||
def setup_hra_exemption_prerequisites(frequency, employee=None, from_date=None): | ||
from hrms.payroll.doctype.salary_slip.test_salary_slip import create_tax_slab | ||
from hrms.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure | ||
|
||
|
@@ -499,6 +500,7 @@ def setup_hra_exemption_prerequisites(frequency, employee=None): | |
company="_Test Company", | ||
currency="INR", | ||
payroll_period=payroll_period, | ||
from_date=from_date, | ||
) | ||
|
||
frappe.db.set_value( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters