Skip to content

[pull] develop from frappe:develop #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 33 commits into from
May 11, 2026
Merged

[pull] develop from frappe:develop #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2788f37
fix: clean up ShiftAssignmentDialog employee mapping and enhance Link…
krishna-254 May 7, 2026
9929d5d
fix: Applicable after based on calendar days instead of working days
deepeshgarg007 May 7, 2026
5089643
fix: French translations
frappe-pr-bot May 8, 2026
b0d4031
chore: update POT file
frappe-pr-bot May 10, 2026
d3e56c6
Merge pull request #4495 from deepeshgarg007/applicate_after
deepeshgarg007 May 11, 2026
899833e
Merge pull request #4501 from frappe/pot_develop_2026-05-10
asmitahase May 11, 2026
fc84fc0
Merge pull request #4499 from frappe/l10n_develop
asmitahase May 11, 2026
127a7fa
Merge pull request #4491 from krishna-254/fix/roster-shift-assignment…
asmitahase May 11, 2026
f1dad65
fix: Arabic translations
frappe-pr-bot May 11, 2026
e0b5d59
fix: Italian translations
frappe-pr-bot May 11, 2026
6f02f88
fix: Swedish translations
frappe-pr-bot May 11, 2026
345aa73
fix: Thai translations
frappe-pr-bot May 11, 2026
c4e4c9d
fix: Croatian translations
frappe-pr-bot May 11, 2026
6094f3f
fix: Bosnian translations
frappe-pr-bot May 11, 2026
a49810b
fix: Spanish translations
frappe-pr-bot May 11, 2026
35669ea
fix: Czech translations
frappe-pr-bot May 11, 2026
39b893a
fix: Danish translations
frappe-pr-bot May 11, 2026
5270b40
fix: German translations
frappe-pr-bot May 11, 2026
30573a9
fix: Hungarian translations
frappe-pr-bot May 11, 2026
a32c2e5
fix: Dutch translations
frappe-pr-bot May 11, 2026
3addea1
fix: Polish translations
frappe-pr-bot May 11, 2026
84ce5b3
fix: Portuguese translations
frappe-pr-bot May 11, 2026
e851112
fix: Russian translations
frappe-pr-bot May 11, 2026
7531bdd
fix: Slovenian translations
frappe-pr-bot May 11, 2026
9f62c9d
fix: Serbian (Cyrillic) translations
frappe-pr-bot May 11, 2026
a78fe0a
fix: Turkish translations
frappe-pr-bot May 11, 2026
f97edd8
fix: Vietnamese translations
frappe-pr-bot May 11, 2026
a99bdbb
fix: Portuguese, Brazilian translations
frappe-pr-bot May 11, 2026
c8c4656
fix: Indonesian translations
frappe-pr-bot May 11, 2026
2f8b8d4
fix: Burmese translations
frappe-pr-bot May 11, 2026
7cc103c
fix: Norwegian Bokmal translations
frappe-pr-bot May 11, 2026
f029f6c
fix: Serbian (Latin) translations
frappe-pr-bot May 11, 2026
5c969f4
Merge pull request #4510 from frappe/l10n_develop
asmitahase May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions hrms/hr/doctype/leave_application/leave_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,11 @@ def validate_applicable_after(self):
leave_type = frappe.get_doc("Leave Type", self.leave_type)
if leave_type.applicable_after > 0:
date_of_joining = frappe.db.get_value("Employee", self.employee, "date_of_joining")
leave_days = get_approved_leaves_for_period(
self.employee, False, date_of_joining, self.from_date
)
number_of_days = date_diff(getdate(self.from_date), date_of_joining)
if number_of_days >= 0:
holidays = 0
if not frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"):
holidays = get_holidays(self.employee, date_of_joining, self.from_date)
number_of_days = number_of_days - leave_days - holidays
if number_of_days < leave_type.applicable_after:
frappe.throw(
_("{0} applicable after {1} working days").format(
_("{0} applicable after {1} calendar days").format(
self.leave_type, leave_type.applicable_after
)
)
Expand Down
6 changes: 3 additions & 3 deletions hrms/hr/doctype/leave_type/leave_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
"label": "Maximum Leave Allocation Allowed per Leave Period"
},
{
"description": "Minimum working days required since Date of Joining to apply for this leave",
"description": "Minimum calendar days required since Date of Joining to apply for this leave",
"fieldname": "applicable_after",
"fieldtype": "Int",
"label": "Allow Leave Application After (Working Days)"
"label": "Allow Leave Application After (Calendar Days)"
},
{
"fieldname": "max_continuous_days_allowed",
Expand Down Expand Up @@ -259,7 +259,7 @@
"icon": "fa fa-flag",
"idx": 1,
"links": [],
"modified": "2026-02-06 18:26:27.583525",
"modified": "2026-05-07 18:26:27.583525",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Type",
Expand Down
40 changes: 20 additions & 20 deletions hrms/locale/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: contact@frappe.io\n"
"POT-Creation-Date: 2026-04-26 09:47+0000\n"
"PO-Revision-Date: 2026-04-26 18:15\n"
"POT-Creation-Date: 2026-05-03 09:54+0000\n"
"PO-Revision-Date: 2026-05-11 07:39\n"
"Last-Translator: contact@frappe.io\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -323,7 +323,7 @@ msgstr "{0} موجود بين {1} و {2} ("
#: hrms/hr/doctype/attendance/attendance.json
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
#: hrms/hr/doctype/training_event_employee/training_event_employee.json
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:736
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:793
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Absent"
msgstr "غائب"
Expand Down Expand Up @@ -5827,7 +5827,7 @@ msgstr ""

#. Option for the 'Calculate Payroll Working Days Based On' (Select) field in
#. DocType 'Payroll Settings'
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:738
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:795
#: hrms/overrides/dashboard_overrides.py:12
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Leave"
Expand Down Expand Up @@ -5970,7 +5970,7 @@ msgstr "التواريخ الممنوع اخذ اجازة فيها"
msgid "Leave Block List Name"
msgstr "اسم قائمة الإجازات المحظورة"

#: hrms/hr/doctype/leave_application/leave_application.py:1448
#: hrms/hr/doctype/leave_application/leave_application.py:1447
msgid "Leave Blocked"
msgstr "إجازة محظورة"

Expand Down Expand Up @@ -6942,11 +6942,11 @@ msgstr ""
msgid "No attendance records found for employee {0} between {1} and {2}"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:71
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:75
msgid "No attendance records found for this criteria."
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:64
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:68
msgid "No attendance records found."
msgstr ""

Expand Down Expand Up @@ -7910,7 +7910,7 @@ msgstr "يرجى تحديد موظف"
msgid "Please select Employee first."
msgstr "الرجاء تحديد الموظف أولاً."

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:41
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:45
msgid "Please select Filter Based On"
msgstr ""

Expand Down Expand Up @@ -7967,7 +7967,7 @@ msgstr ""
msgid "Please select at least one row to perform this action."
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:55
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:59
msgid "Please select company."
msgstr ""

Expand All @@ -7984,7 +7984,7 @@ msgstr ""
msgid "Please select half day attendance status."
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:44
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:48
msgid "Please select month and year."
msgstr ""

Expand Down Expand Up @@ -8029,7 +8029,7 @@ msgid "Please set Relieving Date for employee: {0}"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js:186
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:52
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:56
msgid "Please set a date range less than 90 days."
msgstr ""

Expand Down Expand Up @@ -8065,7 +8065,7 @@ msgstr "يرجى تحديد تاريخ الالتحاق بالموظف {0}"
msgid "Please set the Holiday List."
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:48
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:52
msgid "Please set the date range."
msgstr ""

Expand Down Expand Up @@ -8149,7 +8149,7 @@ msgstr "المنطقة المفضلة للسكن"
#: hrms/hr/doctype/attendance/attendance.json
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
#: hrms/hr/doctype/training_event_employee/training_event_employee.json
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:737
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:794
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Present"
msgstr "حاضر"
Expand Down Expand Up @@ -9920,7 +9920,7 @@ msgstr "تواريخ البدء والانتهاء ليست في فترة كشو
msgid "Start date cannot be greater than end date"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:50
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:54
msgid "Start date cannot be greater than end date."
msgstr ""

Expand Down Expand Up @@ -10459,7 +10459,7 @@ msgstr ""
msgid "Today {0} completed {1} {2} at our Company! 🎉"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:149
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:153
msgid "Total Absent"
msgstr "إجمالي الغياب"

Expand Down Expand Up @@ -10549,7 +10549,7 @@ msgstr "مجموع الخصم"
msgid "Total Deduction (Company Currency)"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:174
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:178
msgid "Total Early Exits"
msgstr "إجمالي المخارج المبكرة"

Expand Down Expand Up @@ -10621,7 +10621,7 @@ msgstr ""
msgid "Total Interest Amount"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:168
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:172
msgid "Total Late Entries"
msgstr "مجموع الإدخالات المتأخرة"

Expand All @@ -10630,7 +10630,7 @@ msgstr "مجموع الإدخالات المتأخرة"
msgid "Total Leave Days"
msgstr "مجموع أيام الإجازة"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:148
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:152
msgid "Total Leaves"
msgstr "مجموع الإجازات"

Expand Down Expand Up @@ -10683,7 +10683,7 @@ msgstr ""
msgid "Total Payout"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:143
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:147
msgid "Total Present"
msgstr "إجمالي الحضور"

Expand Down Expand Up @@ -11015,7 +11015,7 @@ msgstr "الحضور بدون علامات لعدة أيام"
msgid "Unmarked Check-in Logs Found"
msgstr ""

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:157
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:161
#: hrms/public/js/templates/employees_with_unmarked_attendance.html:19
msgid "Unmarked Days"
msgstr "أيام غير محددة"
Expand Down
40 changes: 20 additions & 20 deletions hrms/locale/bs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: contact@frappe.io\n"
"POT-Creation-Date: 2026-04-26 09:47+0000\n"
"PO-Revision-Date: 2026-04-28 18:17\n"
"POT-Creation-Date: 2026-05-03 09:54+0000\n"
"PO-Revision-Date: 2026-05-11 07:39\n"
"Last-Translator: contact@frappe.io\n"
"Language-Team: Bosnian\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -348,7 +348,7 @@ msgstr "{0} postoji između {1} i {2}("
#: hrms/hr/doctype/attendance/attendance.json
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
#: hrms/hr/doctype/training_event_employee/training_event_employee.json
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:736
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:793
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Absent"
msgstr "Odsutan"
Expand Down Expand Up @@ -5855,7 +5855,7 @@ msgstr "Širina: {0}°"

#. Option for the 'Calculate Payroll Working Days Based On' (Select) field in
#. DocType 'Payroll Settings'
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:738
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:795
#: hrms/overrides/dashboard_overrides.py:12
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Leave"
Expand Down Expand Up @@ -5998,7 +5998,7 @@ msgstr "Datumi Liste Blokiranog Odsustva"
msgid "Leave Block List Name"
msgstr "Naziv Liste Blokiranog Odsustva"

#: hrms/hr/doctype/leave_application/leave_application.py:1448
#: hrms/hr/doctype/leave_application/leave_application.py:1447
msgid "Leave Blocked"
msgstr "Odsustvo Blokirano"

Expand Down Expand Up @@ -6970,11 +6970,11 @@ msgstr "Nisu pronađeni detalji o zaostalim plaćanjima"
msgid "No attendance records found for employee {0} between {1} and {2}"
msgstr "Nisu pronađeni zapisi o prisutnosti za {0} između {1} i {2}"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:71
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:75
msgid "No attendance records found for this criteria."
msgstr "Nije pronađen zapisnik o Prisutnosti za ovaj kriterij."

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:64
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:68
msgid "No attendance records found."
msgstr "Nije pronađen zapis Prisutnosti."

Expand Down Expand Up @@ -7938,7 +7938,7 @@ msgstr "Navedi Personal"
msgid "Please select Employee first."
msgstr "Navedi Personal"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:41
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:45
msgid "Please select Filter Based On"
msgstr "Odaberi Filter na osnovu"

Expand Down Expand Up @@ -7995,7 +7995,7 @@ msgstr "Navedi najmanje jedno iz personala da izvršite ovu radnju."
msgid "Please select at least one row to perform this action."
msgstr "Odaberi barem jedan red da izvršite ovu radnju."

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:55
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:59
msgid "Please select company."
msgstr "Odaberi Poduzeće."

Expand All @@ -8012,7 +8012,7 @@ msgstr "Navedi Personal za koje ćete izraditi procjenjivanje"
msgid "Please select half day attendance status."
msgstr "Odaberi status Poludnevnog Prisustva."

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:44
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:48
msgid "Please select month and year."
msgstr "Odaberi mjesec i godinu."

Expand Down Expand Up @@ -8057,7 +8057,7 @@ msgid "Please set Relieving Date for employee: {0}"
msgstr "Postavi Datum Otkaza za: {0}"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js:186
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:52
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:56
msgid "Please set a date range less than 90 days."
msgstr "Postavi raspon datuma kraći od 90 dana."

Expand Down Expand Up @@ -8093,7 +8093,7 @@ msgstr "Postavi Datum zapošljavanja za {0}"
msgid "Please set the Holiday List."
msgstr "Postavi Listu Praznika."

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:48
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:52
msgid "Please set the date range."
msgstr "Postavi raspon datuma."

Expand Down Expand Up @@ -8177,7 +8177,7 @@ msgstr "Preferirano područje za smještaj"
#: hrms/hr/doctype/attendance/attendance.json
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
#: hrms/hr/doctype/training_event_employee/training_event_employee.json
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:737
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:794
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Present"
msgstr "Prisutan"
Expand Down Expand Up @@ -9948,7 +9948,7 @@ msgstr "Datum početka i završetka nije u važećem obračunskom periodu, ne mo
msgid "Start date cannot be greater than end date"
msgstr "Datum početka ne može biti kasnije od datuma završetka"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:50
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:54
msgid "Start date cannot be greater than end date."
msgstr "Datum početka ne može biti kasnije od datuma završetka."

Expand Down Expand Up @@ -10487,7 +10487,7 @@ msgstr "Danas je {0} u našem Poduzeću! 🎉"
msgid "Today {0} completed {1} {2} at our Company! 🎉"
msgstr "Danas {0} ispunio {1} {2} u našem Poduzeću! 🎉"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:149
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:153
msgid "Total Absent"
msgstr "Ukupna Odsutnost"

Expand Down Expand Up @@ -10577,7 +10577,7 @@ msgstr "Ukupni Odbitak"
msgid "Total Deduction (Company Currency)"
msgstr "Ukupni Odbitak (Valuta Poduzeća)"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:174
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:178
msgid "Total Early Exits"
msgstr "Totalno Ranih Odjava"

Expand Down Expand Up @@ -10649,7 +10649,7 @@ msgstr "Ukupan Porez na Prihod"
msgid "Total Interest Amount"
msgstr "Ukupan Iznos Kamate"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:168
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:172
msgid "Total Late Entries"
msgstr "Ukupno Kasnih Prijava"

Expand All @@ -10658,7 +10658,7 @@ msgstr "Ukupno Kasnih Prijava"
msgid "Total Leave Days"
msgstr "Ukupan broj dana Odsustva"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:148
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:152
msgid "Total Leaves"
msgstr "Ukupno Odsustvo"

Expand Down Expand Up @@ -10711,7 +10711,7 @@ msgstr "Ukupna Isplata"
msgid "Total Payout"
msgstr "Ukupna Isplata"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:143
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:147
msgid "Total Present"
msgstr "Ukupno Prisutno"

Expand Down Expand Up @@ -11043,7 +11043,7 @@ msgstr "Nenavedeno Prisustvo za dane"
msgid "Unmarked Check-in Logs Found"
msgstr "Pronađeni su Nenavedeni Zapisi Prijava"

#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:157
#: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:161
#: hrms/public/js/templates/employees_with_unmarked_attendance.html:19
msgid "Unmarked Days"
msgstr "Neprijavljeni Dani"
Expand Down
Loading
Loading