diff --git a/frontend/src/components/AttendanceRequestItem.vue b/frontend/src/components/AttendanceRequestItem.vue
index 795b56e586..9bff79acf5 100644
--- a/frontend/src/components/AttendanceRequestItem.vue
+++ b/frontend/src/components/AttendanceRequestItem.vue
@@ -12,9 +12,9 @@
{{ props.doc.attendance_dates || getDates(props.doc) }}
-
+
·
- {{ __("{0}d", [props.doc.total_attendance_days]) }}
+ {{ __("{0}d", [getTotalDays(props.doc)]) }}
diff --git a/hrms/payroll/doctype/salary_slip/salary_slip.py b/hrms/payroll/doctype/salary_slip/salary_slip.py
index ba67198767..c11f951799 100644
--- a/hrms/payroll/doctype/salary_slip/salary_slip.py
+++ b/hrms/payroll/doctype/salary_slip/salary_slip.py
@@ -2264,6 +2264,7 @@ def email_salary_slip(self):
).format(payroll_settings.password_policy)
if receiver:
+ posting_date = getdate(self.posting_date)
email_args = {
"sender": payroll_settings.sender_email,
"recipients": [receiver],
@@ -2274,6 +2275,7 @@ def email_salary_slip(self):
],
"reference_doctype": self.doctype,
"reference_name": self.name,
+ "send_after": posting_date if posting_date > getdate() else None,
}
if not frappe.flags.in_test:
enqueue(method=frappe.sendmail, queue="short", timeout=300, is_async=True, **email_args)