diff --git a/hrms/locale/main.pot b/hrms/locale/main.pot
index e64825398f..c78dab6880 100644
--- a/hrms/locale/main.pot
+++ b/hrms/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe HR VERSION\n"
 "Report-Msgid-Bugs-To: contact@frappe.io\n"
-"POT-Creation-Date: 2024-10-06 09:34+0000\n"
-"PO-Revision-Date: 2024-10-06 09:34+0000\n"
+"POT-Creation-Date: 2024-10-13 09:34+0000\n"
+"PO-Revision-Date: 2024-10-13 09:34+0000\n"
 "Last-Translator: contact@frappe.io\n"
 "Language-Team: contact@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "% Utilization (B / T)"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:110
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:130
 msgid "'employee_field_value' and 'timestamp' are required."
 msgstr ""
 
@@ -2149,6 +2149,11 @@ msgstr ""
 msgid "Check-out Date"
 msgstr ""
 
+#. Label of the checkin_radius (Int) field in DocType 'Shift Location'
+#: hrms/hr/doctype/shift_location/shift_location.json
+msgid "Checkin Radius"
+msgstr ""
+
 #: hrms/hr/doctype/goal/goal_tree.js:52
 msgid "Child nodes can only be created under 'Group' type nodes"
 msgstr ""
@@ -3680,7 +3685,7 @@ msgstr ""
 msgid "Duration (Days)"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:70
+#: hrms/public/js/utils/index.js:208
 msgid "ERROR({0}): {1}"
 msgstr ""
 
@@ -3936,6 +3941,7 @@ msgstr ""
 #: hrms/hr/doctype/shift_assignment_schedule/shift_assignment_schedule.json
 #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js:161
 #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.js:202
+#: hrms/hr/doctype/shift_location/shift_location.json
 #: hrms/hr/doctype/shift_request/shift_request.json
 #: hrms/hr/doctype/shift_type/shift_type.json
 #: hrms/hr/doctype/training_event_employee/training_event_employee.json
@@ -4109,6 +4115,8 @@ msgstr ""
 #. Interview'
 #. Label of the employee_details_section (Section Break) field in DocType 'Full
 #. and Final Statement'
+#. Label of the employee_details_section (Section Break) field in DocType
+#. 'Shift Assignment'
 #. Label of the employee_details (Section Break) field in DocType 'Travel
 #. Request'
 #. Label of the employee_section (Section Break) field in DocType 'Employee
@@ -4119,6 +4127,7 @@ msgstr ""
 #: hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json
 #: hrms/hr/doctype/exit_interview/exit_interview.json
 #: hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json
+#: hrms/hr/doctype/shift_assignment/shift_assignment.json
 #: hrms/hr/doctype/travel_request/travel_request.json
 #: hrms/payroll/doctype/employee_other_income/employee_other_income.json
 #: hrms/payroll/doctype/payroll_entry/payroll_entry.json
@@ -4610,7 +4619,7 @@ msgstr ""
 msgid "Employee was marked Absent due to missing Employee Checkins."
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:198
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:218
 msgid "Employee was marked Absent for not meeting the working hours threshold."
 msgstr ""
 
@@ -4626,7 +4635,7 @@ msgstr ""
 msgid "Employee {0} already submitted an application {1} for the payroll period {2}"
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:111
+#: hrms/hr/doctype/shift_request/shift_request.py:115
 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period"
 msgstr ""
 
@@ -5324,7 +5333,7 @@ msgstr ""
 msgid "Failed to delete defaults for country {0}."
 msgstr ""
 
-#: hrms/api/__init__.py:609
+#: hrms/api/__init__.py:726
 msgid "Failed to download Salary Slip PDF"
 msgstr ""
 
@@ -5429,11 +5438,13 @@ msgid "Feedback {0} added successfully"
 msgstr ""
 
 #. Label of the fetch_geolocation (Button) field in DocType 'Employee Checkin'
+#. Label of the fetch_geolocation (Button) field in DocType 'Shift Location'
 #: hrms/hr/doctype/employee_checkin/employee_checkin.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 msgid "Fetch Geolocation"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:21
+#: hrms/hr/doctype/employee_checkin/employee_checkin.js:25
 msgid "Fetch Shift"
 msgstr ""
 
@@ -5446,11 +5457,11 @@ msgstr ""
 msgid "Fetching Employees"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:27
+#: hrms/hr/doctype/employee_checkin/employee_checkin.js:31
 msgid "Fetching Shift"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:54
+#: hrms/public/js/utils/index.js:193
 msgid "Fetching your geolocation"
 msgstr ""
 
@@ -5842,16 +5853,17 @@ msgid "General Ledger"
 msgstr ""
 
 #. Label of the geolocation (Geolocation) field in DocType 'Employee Checkin'
+#. Label of the geolocation (Geolocation) field in DocType 'Shift Location'
 #: hrms/hr/doctype/employee_checkin/employee_checkin.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 msgid "Geolocation"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:47
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:74
+#: hrms/public/js/utils/index.js:186 hrms/public/js/utils/index.js:212
 msgid "Geolocation Error"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:46
+#: hrms/public/js/utils/index.js:185
 msgid "Geolocation is not supported by your current browser"
 msgstr ""
 
@@ -6125,6 +6137,7 @@ msgstr ""
 #: hrms/hr/doctype/leave_type/leave_type.json
 #: hrms/hr/doctype/shift_assignment/shift_assignment.json
 #: hrms/hr/doctype/shift_assignment_schedule/shift_assignment_schedule.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 #: hrms/hr/doctype/shift_request/shift_request.json
 #: hrms/hr/doctype/shift_type/shift_type.json hrms/hr/doctype/skill/skill.json
 #: hrms/hr/doctype/staffing_plan/staffing_plan.json
@@ -6208,6 +6221,7 @@ msgstr ""
 #: hrms/hr/doctype/shift_assignment/shift_assignment.json
 #: hrms/hr/doctype/shift_assignment_schedule/shift_assignment_schedule.json
 #: hrms/hr/doctype/shift_assignment_tool/shift_assignment_tool.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 #: hrms/hr/doctype/shift_request/shift_request.json
 #: hrms/hr/doctype/shift_type/shift_type.json
 #: hrms/hr/doctype/staffing_plan/staffing_plan.json
@@ -6349,7 +6363,7 @@ msgid "Hold"
 msgstr ""
 
 #: hrms/hr/doctype/attendance/attendance.py:291
-#: hrms/hr/doctype/leave_application/leave_application.py:1286
+#: hrms/hr/doctype/leave_application/leave_application.py:1290
 #: hrms/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py:24
 msgid "Holiday"
 msgstr ""
@@ -7390,10 +7404,16 @@ msgid "Late Entry Grace Period"
 msgstr ""
 
 #. Label of the latitude (Float) field in DocType 'Employee Checkin'
+#. Label of the latitude (Float) field in DocType 'Shift Location'
 #: hrms/hr/doctype/employee_checkin/employee_checkin.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 msgid "Latitude"
 msgstr ""
 
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:79
+msgid "Latitude and longitude values are required for checking in."
+msgstr ""
+
 #. Option for the 'Calculate Payroll Working Days Based On' (Select) field in
 #. DocType 'Payroll Settings'
 #: hrms/overrides/dashboard_overrides.py:12
@@ -7509,7 +7529,7 @@ msgstr ""
 msgid "Leave Block List Name"
 msgstr ""
 
-#: hrms/hr/doctype/leave_application/leave_application.py:1262
+#: hrms/hr/doctype/leave_application/leave_application.py:1266
 msgid "Leave Blocked"
 msgstr ""
 
@@ -7866,6 +7886,11 @@ msgstr ""
 msgid "Location / Device ID"
 msgstr ""
 
+#. Label of the location_name (Data) field in DocType 'Shift Location'
+#: hrms/hr/doctype/shift_location/shift_location.json
+msgid "Location Name"
+msgstr ""
+
 #. Label of the lodging_required (Check) field in DocType 'Travel Itinerary'
 #: hrms/hr/doctype/travel_itinerary/travel_itinerary.json
 msgid "Lodging Required"
@@ -7876,12 +7901,14 @@ msgstr ""
 msgid "Log Type"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:56
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:63
 msgid "Log Type is required for check-ins falling in the shift: {0}."
 msgstr ""
 
 #. Label of the longitude (Float) field in DocType 'Employee Checkin'
+#. Label of the longitude (Float) field in DocType 'Shift Location'
 #: hrms/hr/doctype/employee_checkin/employee_checkin.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 msgid "Longitude"
 msgstr ""
 
@@ -8420,7 +8447,7 @@ msgstr ""
 msgid "No Employee Found"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:122
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:142
 msgid "No Employee found for the given employee field value. '{}': {}"
 msgstr ""
 
@@ -8760,7 +8787,7 @@ msgstr ""
 msgid "Onboarding Begins On"
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:78
+#: hrms/hr/doctype/shift_request/shift_request.py:82
 msgid "Only Approvers can Approve this Request."
 msgstr ""
 
@@ -8784,7 +8811,7 @@ msgstr ""
 msgid "Only Leave Applications with status 'Approved' and 'Rejected' can be submitted"
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:32
+#: hrms/hr/doctype/shift_request/shift_request.py:36
 msgid "Only Shift Request with status 'Approved' and 'Rejected' can be submitted"
 msgstr ""
 
@@ -8930,7 +8957,7 @@ msgstr ""
 msgid "Overlapping Shift Attendance"
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:119
+#: hrms/hr/doctype/shift_request/shift_request.py:123
 msgid "Overlapping Shift Requests"
 msgstr ""
 
@@ -9899,6 +9926,11 @@ msgstr ""
 msgid "Quick Links"
 msgstr ""
 
+#. Description of the 'Checkin Radius' (Int) field in DocType 'Shift Location'
+#: hrms/hr/doctype/shift_location/shift_location.json
+msgid "Radius within which check-in is allowed (in meters)"
+msgstr ""
+
 #. Label of the raised_by (Link) field in DocType 'Employee Grievance'
 #: hrms/hr/doctype/employee_grievance/employee_grievance.json
 msgid "Raised By"
@@ -9974,7 +10006,7 @@ msgstr ""
 msgid "Reason for Withholding Salary"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:288
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:308
 msgid "Reason for skipping auto attendance:"
 msgstr ""
 
@@ -11350,7 +11382,7 @@ msgstr ""
 msgid "Shift Assignment Tool"
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:47
+#: hrms/hr/doctype/shift_request/shift_request.py:51
 msgid "Shift Assignment: {0} created for Employee: {1}"
 msgstr ""
 
@@ -11361,8 +11393,11 @@ msgstr ""
 msgid "Shift Attendance"
 msgstr ""
 
+#. Label of the shift_details_section (Section Break) field in DocType 'Shift
+#. Assignment'
 #. Label of the shift_details_section (Section Break) field in DocType 'Shift
 #. Assignment Schedule'
+#: hrms/hr/doctype/shift_assignment/shift_assignment.json
 #: hrms/hr/doctype/shift_assignment_schedule/shift_assignment_schedule.json
 msgid "Shift Details"
 msgstr ""
@@ -11376,6 +11411,15 @@ msgstr ""
 msgid "Shift End Time"
 msgstr ""
 
+#. Label of the shift_location (Link) field in DocType 'Shift Assignment'
+#. Name of a DocType
+#. Label of a Link in the Shift & Attendance Workspace
+#: hrms/hr/doctype/shift_assignment/shift_assignment.json
+#: hrms/hr/doctype/shift_location/shift_location.json
+#: hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
+msgid "Shift Location"
+msgstr ""
+
 #. Label of the shift_request (Link) field in DocType 'Shift Assignment'
 #. Name of a DocType
 #. Label of a Link in the Shift & Attendance Workspace
@@ -11448,7 +11492,7 @@ msgstr ""
 msgid "Shift Type"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:33
+#: hrms/hr/doctype/employee_checkin/employee_checkin.js:37
 msgid "Shift has been successfully updated to {0}."
 msgstr ""
 
@@ -11928,6 +11972,7 @@ msgstr ""
 #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json
 #: hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json
 #: hrms/hr/doctype/pwa_notification/pwa_notification.json
+#: hrms/hr/doctype/shift_location/shift_location.json
 #: hrms/hr/doctype/skill/skill.json
 #: hrms/hr/doctype/travel_request/travel_request.json
 #: hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json
@@ -12186,7 +12231,7 @@ msgstr ""
 msgid "This compensatory leave will be applicable from {0}."
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:36
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:43
 msgid "This employee already has a log with the same timestamp.{0}"
 msgstr ""
 
@@ -12973,7 +13018,7 @@ msgstr ""
 msgid "Unable to find Salary Component {0}"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.js:68
+#: hrms/public/js/utils/index.js:206
 msgid "Unable to retrieve your location"
 msgstr ""
 
@@ -13546,7 +13591,7 @@ msgstr ""
 msgid "You can not define multiple slabs if you have a slab with no lower and upper limits."
 msgstr ""
 
-#: hrms/hr/doctype/shift_request/shift_request.py:65
+#: hrms/hr/doctype/shift_request/shift_request.py:69
 msgid "You can not request for your Default Shift: {0}"
 msgstr ""
 
@@ -13558,7 +13603,7 @@ msgstr ""
 msgid "You can only submit Leave Encashment for a valid encashment amount"
 msgstr ""
 
-#: hrms/api/__init__.py:566
+#: hrms/api/__init__.py:683
 msgid "You can only upload JPG, PNG, PDF, TXT or Microsoft documents."
 msgstr ""
 
@@ -13566,6 +13611,10 @@ msgstr ""
 msgid "You may add additional details, if any, and submit the offer."
 msgstr ""
 
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:105
+msgid "You must be within {0} meters of your shift location to check in."
+msgstr ""
+
 #: hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.py:51
 msgid "You were only present for Half Day on {}. Cannot apply for a full day compensatory leave"
 msgstr ""
@@ -13650,7 +13699,7 @@ msgstr ""
 msgid "{0} Appraisal(s) are not submitted yet"
 msgstr ""
 
-#: hrms/public/js/utils/index.js:192
+#: hrms/public/js/utils/index.js:229
 msgid "{0} Field"
 msgstr ""
 
@@ -13799,7 +13848,7 @@ msgstr ""
 msgid "{} Unclaimed"
 msgstr ""
 
-#: hrms/hr/doctype/employee_checkin/employee_checkin.py:208
+#: hrms/hr/doctype/employee_checkin/employee_checkin.py:228
 msgid "{} is an invalid Attendance Status."
 msgstr ""