Skip to content

Commit

Permalink
Merge pull request #2745 from frappe/mergify/bp/version-14-hotfix/pr-…
Browse files Browse the repository at this point in the history
…2743

test: fixed failing tests due to implicitly set dates (backport #2743)
  • Loading branch information
asmitahase authored Feb 2, 2025
2 parents 253e243 + 81c35f9 commit b884147
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions hrms/hr/doctype/leave_encashment/test_leave_encashment.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ def get_encashment_created_after_leave_period(self, employee, is_carry_forward):
"Salary Structure for Encashment",
"Monthly",
employee,
from_date=start_date,
other_details={"leave_encashment_amount_per_day": 50},
)

Expand Down
4 changes: 3 additions & 1 deletion hrms/payroll/doctype/salary_slip/test_salary_slip.py
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,9 @@ def test_statistical_component_based_on_payment_days(self):
precision = entry.precision("amount")
break

self.assertEqual(amount, flt((1000 * ss.payment_days / ss.total_working_days) * 0.5, precision))
self.assertEqual(
amount, flt(flt((1000 * ss.payment_days / ss.total_working_days), precision) * 0.5, precision)
)

def make_activity_for_employee(self):
activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")
Expand Down

0 comments on commit b884147

Please sign in to comment.