Skip to content

Commit

Permalink
Merge pull request #2248 from frappe/version-15-hotfix
Browse files Browse the repository at this point in the history
chore: release v15
  • Loading branch information
krantheman authored Oct 7, 2024
2 parents c013b52 + 2120426 commit 1b4a111
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion hrms/hr/doctype/employee_checkin/employee_checkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,9 @@ def calculate_working_hours(logs, check_in_out_type, working_hours_calc_type):
if last_out_log_index or last_out_log_index == 0
else None
)
in_time = getattr(first_in_log, "time", None)
out_time = getattr(last_out_log, "time", None)
if first_in_log and last_out_log:
in_time, out_time = first_in_log.time, last_out_log.time
total_hours = time_diff_in_hours(in_time, out_time)
elif working_hours_calc_type == "Every Valid Check-in and Check-out":
in_log = out_log = None
Expand Down
5 changes: 5 additions & 0 deletions hrms/payroll/doctype/salary_slip/salary_slip.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
flt,
formatdate,
get_first_day,
get_last_day,
get_link_to_form,
getdate,
money_in_words,
Expand Down Expand Up @@ -73,6 +74,8 @@ def __init__(self, *args, **kwargs):
"rounded": rounded,
"date": date,
"getdate": getdate,
"get_first_day": get_first_day,
"get_last_day": get_last_day,
"ceil": ceil,
"floor": floor,
}
Expand Down Expand Up @@ -2158,6 +2161,8 @@ def eval_tax_slab_condition(condition, eval_globals=None, eval_locals=None):
"round": round,
"date": date,
"getdate": getdate,
"get_first_day": get_first_day,
"get_last_day": get_last_day,
}

try:
Expand Down

0 comments on commit 1b4a111

Please sign in to comment.