diff --git a/frontend/src/components/CheckInPanel.vue b/frontend/src/components/CheckInPanel.vue
index 99481e03e8..9f859e8dbb 100644
--- a/frontend/src/components/CheckInPanel.vue
+++ b/frontend/src/components/CheckInPanel.vue
@@ -2,14 +2,14 @@
 	<div class="flex flex-col bg-white rounded w-full py-6 px-4 border-none">
 		<h2 class="text-lg font-bold text-gray-900">Hey, {{ employee?.data?.first_name }} 👋</h2>
 
-		<template v-if="allowCheckinFromMobile.data">
+		<template v-if="HRSettings.doc?.allow_employee_checkin_from_mobile_app">
 			<div class="font-medium text-sm text-gray-500 mt-1.5" v-if="lastLog">
 				Last {{ lastLogType }} was at {{ lastLogTime }}
 			</div>
 			<Button
 				class="mt-4 mb-1 drop-shadow-sm py-5 text-base"
 				id="open-checkin-modal"
-				@click="checkinTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss')"
+				@click="handleEmployeeCheckin"
 			>
 				<template #prefix>
 					<FeatherIcon
@@ -19,44 +19,62 @@
 				</template>
 				{{ nextAction.label }}
 			</Button>
-
-			<ion-modal
-				ref="modal"
-				trigger="open-checkin-modal"
-				:initial-breakpoint="1"
-				:breakpoints="[0, 1]"
-			>
-				<div class="h-40 w-full flex flex-col items-center justify-center gap-5 p-4 mb-5">
-					<div class="flex flex-col gap-1.5 items-center justify-center">
-						<div class="font-bold text-xl">
-							{{ dayjs(checkinTimestamp).format("hh:mm:ss a") }}
-						</div>
-						<div class="font-medium text-gray-500 text-sm">
-							{{ dayjs().format("D MMM, YYYY") }}
-						</div>
-					</div>
-					<Button
-						variant="solid"
-						class="w-full py-5 text-sm"
-						@click="submitLog(nextAction.action)"
-					>
-						Confirm {{ nextAction.label }}
-					</Button>
-				</div>
-			</ion-modal>
 		</template>
 
 		<div v-else class="font-medium text-sm text-gray-500 mt-1.5">
 			{{ dayjs().format("ddd, D MMMM, YYYY") }}
 		</div>
 	</div>
+
+	<ion-modal
+		v-if="HRSettings.doc?.allow_employee_checkin_from_mobile_app"
+		ref="modal"
+		trigger="open-checkin-modal"
+		:initial-breakpoint="1"
+		:breakpoints="[0, 1]"
+	>
+		<div class="h-120 w-full flex flex-col items-center justify-center gap-5 p-4 mb-5">
+			<div class="flex flex-col gap-1.5 mt-2 items-center justify-center">
+				<div class="font-bold text-xl">
+					{{ dayjs(checkinTimestamp).format("hh:mm:ss a") }}
+				</div>
+				<div class="font-medium text-gray-500 text-sm">
+					{{ dayjs().format("D MMM, YYYY") }}
+				</div>
+			</div>
+
+			<template v-if="HRSettings.doc?.allow_geolocation_tracking">
+				<span v-if="locationStatus" class="font-medium text-gray-500 text-sm">
+					{{ locationStatus }}
+				</span>
+
+				<div class="rounded border-4 translate-z-0 block overflow-hidden w-full h-170">
+					<iframe
+						width="100%"
+						height="170"
+						frameborder="0"
+						scrolling="no"
+						marginheight="0"
+						marginwidth="0"
+						style="border: 0"
+						:src="`https://maps.google.com/maps?q=${latitude},${longitude}&hl=en&z=15&amp;output=embed`"
+					>
+					</iframe>
+				</div>
+			</template>
+
+			<Button variant="solid" class="w-full py-5 text-sm" @click="submitLog(nextAction.action)">
+				Confirm {{ nextAction.label }}
+			</Button>
+		</div>
+	</ion-modal>
 </template>
 
 <script setup>
 import { createListResource, toast, FeatherIcon } from "frappe-ui"
 import { computed, inject, ref, onMounted, onBeforeUnmount } from "vue"
 import { IonModal, modalController } from "@ionic/vue"
-import { allowCheckinFromMobile } from "@/data/settings"
+import { HRSettings } from "@/data/HRSettings"
 
 const DOCTYPE = "Employee Checkin"
 
@@ -64,6 +82,9 @@ const socket = inject("$socket")
 const employee = inject("$employee")
 const dayjs = inject("$dayjs")
 const checkinTimestamp = ref(null)
+const latitude = ref(0)
+const longitude = ref(0)
+const locationStatus = ref("")
 
 const checkins = createListResource({
 	doctype: DOCTYPE,
@@ -102,6 +123,38 @@ const lastLogTime = computed(() => {
 	return `${formattedTime} on ${dayjs(timestamp).format("D MMM, YYYY")}`
 })
 
+function handleLocationSuccess(position) {
+	latitude.value = position.coords.latitude
+	longitude.value = position.coords.longitude
+
+	locationStatus.value = `
+		Latitude: ${Number(latitude.value).toFixed(5)}°,
+		Longitude: ${Number(longitude.value).toFixed(5)}°
+	`
+}
+
+function handleLocationError(error) {
+	locationStatus.value = "Unable to retrieve your location"
+	if (error) locationStatus.value += `: ERROR(${error.code}): ${error.message}`
+}
+
+const fetchLocation = () => {
+	if (!navigator.geolocation) {
+		locationStatus.value = "Geolocation is not supported by your current browser"
+	} else {
+		locationStatus.value = "Locating..."
+		navigator.geolocation.getCurrentPosition(handleLocationSuccess, handleLocationError)
+	}
+}
+
+const handleEmployeeCheckin = () => {
+	checkinTimestamp.value = dayjs().format("YYYY-MM-DD HH:mm:ss")
+
+	if (HRSettings.doc?.allow_geolocation_tracking) {
+		fetchLocation()
+	}
+}
+
 const submitLog = (logType) => {
 	const action = logType === "IN" ? "Check-in" : "Check-out"
 
@@ -110,6 +163,8 @@ const submitLog = (logType) => {
 			employee: employee.data.name,
 			log_type: logType,
 			time: checkinTimestamp.value,
+			latitude: latitude.value,
+			longitude: longitude.value,
 		},
 		{
 			onSuccess() {
diff --git a/frontend/src/data/HRSettings.js b/frontend/src/data/HRSettings.js
new file mode 100644
index 0000000000..a0894aad4f
--- /dev/null
+++ b/frontend/src/data/HRSettings.js
@@ -0,0 +1,7 @@
+import { createDocumentResource } from "frappe-ui"
+
+export const HRSettings = createDocumentResource({
+	doctype: "HR Settings",
+	name: "HR Settings",
+	auto: true,
+})
diff --git a/frontend/src/data/settings.js b/frontend/src/data/settings.js
deleted file mode 100644
index 026588eb8a..0000000000
--- a/frontend/src/data/settings.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createResource } from "frappe-ui"
-
-export const allowCheckinFromMobile = createResource({
-	url: "hrms.api.is_employee_checkin_allowed",
-	auto: true,
-})
diff --git a/hrms/api/__init__.py b/hrms/api/__init__.py
index 0383910d08..0e38828eac 100644
--- a/hrms/api/__init__.py
+++ b/hrms/api/__init__.py
@@ -3,7 +3,6 @@
 from frappe.model.workflow import get_workflow_name
 from frappe.query_builder import Order
 from frappe.utils import getdate
-from frappe.utils.data import cint
 
 SUPPORTED_FIELD_TYPES = [
 	"Link",
@@ -627,8 +626,3 @@ def get_workflow_state_field(doctype: str) -> str | None:
 def get_allowed_states_for_workflow(workflow: dict, user_id: str) -> list[str]:
 	user_roles = frappe.get_roles(user_id)
 	return [transition.state for transition in workflow.transitions if transition.allowed in user_roles]
-
-
-@frappe.whitelist()
-def is_employee_checkin_allowed():
-	return cint(frappe.db.get_single_value("HR Settings", "allow_employee_checkin_from_mobile_app"))
diff --git a/hrms/hr/doctype/appraisal/appraisal.py b/hrms/hr/doctype/appraisal/appraisal.py
index 9ea9b1b9d4..fa72e4f35d 100644
--- a/hrms/hr/doctype/appraisal/appraisal.py
+++ b/hrms/hr/doctype/appraisal/appraisal.py
@@ -9,6 +9,7 @@
 
 from hrms.hr.doctype.appraisal_cycle.appraisal_cycle import validate_active_appraisal_cycle
 from hrms.hr.utils import validate_active_employee
+from hrms.payroll.utils import sanitize_expression
 
 
 class Appraisal(Document):
@@ -179,7 +180,27 @@ def calculate_avg_feedback_score(self, update=False):
 			self.db_update()
 
 	def calculate_final_score(self):
-		final_score = (flt(self.total_score) + flt(self.avg_feedback_score) + flt(self.self_score)) / 3
+		final_score = 0
+		appraisal_cycle_doc = frappe.get_cached_doc("Appraisal Cycle", self.appraisal_cycle)
+
+		formula = appraisal_cycle_doc.final_score_formula
+		based_on_formula = appraisal_cycle_doc.calculate_final_score_based_on_formula
+
+		if based_on_formula:
+			employee_doc = frappe.get_cached_doc("Employee", self.employee)
+			data = {
+				"goal_score": flt(self.total_score),
+				"average_feedback_score": flt(self.avg_feedback_score),
+				"self_appraisal_score": flt(self.self_score),
+			}
+			data.update(appraisal_cycle_doc.as_dict())
+			data.update(employee_doc.as_dict())
+			data.update(self.as_dict())
+
+			sanitized_formula = sanitize_expression(formula)
+			final_score = frappe.safe_eval(sanitized_formula, data)
+		else:
+			final_score = (flt(self.total_score) + flt(self.avg_feedback_score) + flt(self.self_score)) / 3
 
 		self.final_score = flt(final_score, self.precision("final_score"))
 
diff --git a/hrms/hr/doctype/appraisal/test_appraisal.py b/hrms/hr/doctype/appraisal/test_appraisal.py
index 029b6c52bd..bff9a04db1 100644
--- a/hrms/hr/doctype/appraisal/test_appraisal.py
+++ b/hrms/hr/doctype/appraisal/test_appraisal.py
@@ -69,7 +69,26 @@ def test_manual_kra_rating(self):
 	def test_final_score(self):
 		cycle = create_appraisal_cycle(designation="Engineer", kra_evaluation_method="Manual Rating")
 		cycle.create_appraisals()
+		appraisal = self.setup_appraisal(cycle)
 
+		self.assertEqual(appraisal.final_score, 3.767)
+
+	def test_final_score_using_formula(self):
+		cycle = create_appraisal_cycle(designation="Engineer", kra_evaluation_method="Manual Rating")
+		cycle.update(
+			{
+				"calculate_final_score_based_on_formula": 1,
+				"final_score_formula": "(goal_score + self_appraisal_score + average_feedback_score)/3 if self_appraisal_score else (goal_score + self_appraisal_score)/2",
+			}
+		)
+		cycle.save()
+		cycle.create_appraisals()
+
+		appraisal = self.setup_appraisal(cycle)
+
+		self.assertEqual(appraisal.final_score, 3.767)
+
+	def setup_appraisal(self, cycle):
 		appraisal = frappe.db.exists("Appraisal", {"appraisal_cycle": cycle.name, "employee": self.employee1})
 		appraisal = frappe.get_doc("Appraisal", appraisal)
 
@@ -97,7 +116,8 @@ def test_final_score(self):
 		feedback.submit()
 
 		appraisal.reload()
-		self.assertEqual(appraisal.final_score, 3.767)
+
+		return appraisal
 
 	def test_goal_score(self):
 		"""
diff --git a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js
index b342030618..dccae27988 100644
--- a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js
+++ b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js
@@ -13,6 +13,7 @@ frappe.ui.form.on("Appraisal Cycle", {
 
 		frm.trigger("show_custom_buttons");
 		frm.trigger("show_appraisal_summary");
+		frm.trigger("set_autocompletions_for_final_score_formula");
 	},
 
 	show_custom_buttons(frm) {
@@ -26,28 +27,42 @@ frappe.ui.form.on("Appraisal Cycle", {
 			frappe.set_route("Tree", "Goal");
 		});
 
-		let className = "";
 		let appraisals_created = frm.doc.__onload?.appraisals_created;
 
 		if (frm.doc.status !== "Completed") {
-			className = appraisals_created ? "btn-default" : "btn-primary";
-
-			frm.add_custom_button(__("Create Appraisals"), () => {
-				frm.trigger("create_appraisals");
-			}).addClass(className);
+			if (appraisals_created) {
+				frm.add_custom_button(__("Create Appraisals"), () => {
+					frm.trigger("create_appraisals");
+				});
+			} else {
+				frm.page.set_primary_action(__("Create Appraisals"), () => {
+					frm.trigger("create_appraisals");
+				});
+			}
 		}
 
-		className = appraisals_created ? "btn-primary" : "btn-default";
-
 		if (frm.doc.status === "Not Started") {
-			frm.add_custom_button(__("Start"), () => {
-				frm.set_value("status", "In Progress");
-				frm.save();
-			}).addClass(className);
+			if (appraisals_created) {
+				frm.page.set_primary_action(__("Start"), () => {
+					frm.set_value("status", "In Progress");
+					frm.save();
+				});
+			} else {
+				frm.add_custom_button(__("Start"), () => {
+					frm.set_value("status", "In Progress");
+					frm.save();
+				});
+			}
 		} else if (frm.doc.status === "In Progress") {
-			frm.add_custom_button(__("Mark as Completed"), () => {
-				frm.trigger("complete_cycle");
-			}).addClass(className);
+			if (appraisals_created) {
+				frm.page.set_primary_action(__("Mark as Completed"), () => {
+					frm.trigger("complete_cycle");
+				});
+			} else {
+				frm.add_custom_button(__("Mark as Completed"), () => {
+					frm.trigger("complete_cycle");
+				});
+			}
 		} else if (frm.doc.status === "Completed") {
 			frm.add_custom_button(__("Mark as In Progress"), () => {
 				frm.set_value("status", "In Progress");
@@ -56,6 +71,42 @@ frappe.ui.form.on("Appraisal Cycle", {
 		}
 	},
 
+	set_autocompletions_for_final_score_formula: async (frm) => {
+		const autocompletions = [
+			{
+				value: "goal_score",
+				score: 10,
+				meta: __("Total Goal Score"),
+			},
+			{
+				value: "average_feedback_score",
+				score: 10,
+				meta: __("Average Feedback Score"),
+			},
+			{
+				value: "self_appraisal_score",
+				score: 10,
+				meta: __("Self Appraisal Score"),
+			},
+		];
+
+		await Promise.all(
+			["Employee", "Appraisal Cycle", "Appraisal"].map((doctype) =>
+				frappe.model.with_doctype(doctype, () => {
+					autocompletions.push(
+						...frappe.get_meta(doctype).fields.map((f) => ({
+							value: f.fieldname,
+							score: 8,
+							meta: __("{0} Field", [doctype]),
+						})),
+					);
+				}),
+			),
+		);
+
+		frm.set_df_property("final_score_formula", "autocompletions", autocompletions);
+	},
+
 	get_employees(frm) {
 		frappe.call({
 			method: "set_employees",
diff --git a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
index 4a376ef75f..89a1afd742 100644
--- a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
+++ b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
@@ -17,7 +17,11 @@
   "section_break_4",
   "description",
   "settings_section",
+  "column_break_vhzx",
   "kra_evaluation_method",
+  "section_break_zykh",
+  "calculate_final_score_based_on_formula",
+  "final_score_formula",
   "applicable_for_tab",
   "filters_section",
   "branch",
@@ -154,6 +158,31 @@
    "label": "Status",
    "options": "Not Started\nIn Progress\nCompleted",
    "read_only": 1
+  },
+  {
+   "depends_on": "calculate_final_score_based_on_formula",
+   "fieldname": "final_score_formula",
+   "fieldtype": "Code",
+   "label": "Final Score Formula",
+   "mandatory_depends_on": "calculate_final_score_based_on_formula",
+   "max_height": "5rem",
+   "options": "PythonExpression"
+  },
+  {
+   "default": "0",
+   "description": "By default, the Final Score is calculated as the average of Goal Score, Feedback Score, and Self Appraisal Score. Enable this to set a different formula",
+   "fieldname": "calculate_final_score_based_on_formula",
+   "fieldtype": "Check",
+   "label": "Calculate Final Score based on Formula"
+  },
+  {
+   "fieldname": "column_break_vhzx",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_zykh",
+   "fieldtype": "Section Break",
+   "hide_border": 1
   }
  ],
  "index_web_pages_for_search": 1,
@@ -171,7 +200,7 @@
    "link_fieldname": "appraisal_cycle"
   }
  ],
- "modified": "2023-03-29 12:28:36.247120",
+ "modified": "2024-05-29 18:15:06.443594",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Appraisal Cycle",
diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.js b/hrms/hr/doctype/employee_checkin/employee_checkin.js
index 648b61d2b7..a57232706e 100644
--- a/hrms/hr/doctype/employee_checkin/employee_checkin.js
+++ b/hrms/hr/doctype/employee_checkin/employee_checkin.js
@@ -2,6 +2,52 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Employee Checkin", {
-	// setup: (frm) => {
-	// }
+	refresh: async (_frm) => {
+		const allow_geolocation_tracking = await frappe.db.get_single_value(
+			"HR Settings",
+			"allow_geolocation_tracking",
+		);
+
+		if (!allow_geolocation_tracking) {
+			hide_field(["fetch_geolocation", "latitude", "longitude", "geolocation"]);
+			return;
+		}
+	},
+
+	fetch_geolocation: async (frm) => {
+		if (!navigator.geolocation) {
+			frappe.msgprint({
+				message: __("Geolocation is not supported by your current browser"),
+				title: __("Geolocation Error"),
+				indicator: "red",
+			});
+			hide_field(["geolocation"]);
+			return;
+		}
+
+		frappe.dom.freeze(__("Fetching your geolocation") + "...");
+
+		navigator.geolocation.getCurrentPosition(
+			async (position) => {
+				frm.set_value("latitude", position.coords.latitude);
+				frm.set_value("longitude", position.coords.longitude);
+
+				await frm.call("set_geolocation_from_coordinates");
+				frappe.dom.unfreeze();
+			},
+			(error) => {
+				frappe.dom.unfreeze();
+
+				let msg = __("Unable to retrieve your location") + "<br><br>";
+				if (error) {
+					msg += __("ERROR({0}): {1}", [error.code, error.message]);
+				}
+				frappe.msgprint({
+					message: msg,
+					title: __("Geolocation Error"),
+					indicator: "red",
+				});
+			},
+		);
+	},
 });
diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.json b/hrms/hr/doctype/employee_checkin/employee_checkin.json
index 14eb5cbcfa..0cb222b9e0 100644
--- a/hrms/hr/doctype/employee_checkin/employee_checkin.json
+++ b/hrms/hr/doctype/employee_checkin/employee_checkin.json
@@ -15,8 +15,17 @@
   "device_id",
   "skip_auto_attendance",
   "attendance",
+  "location_section",
+  "latitude",
+  "column_break_yqpi",
+  "longitude",
+  "section_break_ksbo",
+  "fetch_geolocation",
+  "geolocation",
+  "shift_timings_section",
   "shift_start",
   "shift_end",
+  "column_break_vyyt",
   "shift_actual_start",
   "shift_actual_end"
  ],
@@ -107,10 +116,58 @@
    "fieldtype": "Datetime",
    "hidden": 1,
    "label": "Shift Actual End"
+  },
+  {
+   "fieldname": "location_section",
+   "fieldtype": "Section Break",
+   "label": "Location"
+  },
+  {
+   "fieldname": "geolocation",
+   "fieldtype": "Geolocation",
+   "label": "Geolocation",
+   "read_only": 1
+  },
+  {
+   "fieldname": "shift_timings_section",
+   "fieldtype": "Section Break",
+   "label": "Shift Timings"
+  },
+  {
+   "fieldname": "column_break_vyyt",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "latitude",
+   "fieldtype": "Float",
+   "label": "Latitude",
+   "precision": "7",
+   "read_only": 1
+  },
+  {
+   "fieldname": "longitude",
+   "fieldtype": "Float",
+   "label": "Longitude",
+   "precision": "7",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_yqpi",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_ksbo",
+   "fieldtype": "Section Break",
+   "hide_border": 1
+  },
+  {
+   "fieldname": "fetch_geolocation",
+   "fieldtype": "Button",
+   "label": "Fetch Geolocation"
   }
  ],
  "links": [],
- "modified": "2024-04-02 01:50:23.150627",
+ "modified": "2024-05-29 21:19:11.550766",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Checkin",
diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.py b/hrms/hr/doctype/employee_checkin/employee_checkin.py
index 8524b6ef6a..aca800de41 100644
--- a/hrms/hr/doctype/employee_checkin/employee_checkin.py
+++ b/hrms/hr/doctype/employee_checkin/employee_checkin.py
@@ -18,6 +18,7 @@ def validate(self):
 		validate_active_employee(self.employee)
 		self.validate_duplicate_log()
 		self.fetch_shift()
+		self.set_geolocation_from_coordinates()
 
 	def validate_duplicate_log(self):
 		doc = frappe.db.exists(
@@ -60,6 +61,28 @@ def fetch_shift(self):
 		else:
 			self.shift = None
 
+	@frappe.whitelist()
+	def set_geolocation_from_coordinates(self):
+		if not frappe.db.get_single_value("HR Settings", "allow_geolocation_tracking"):
+			return
+
+		if not (self.latitude and self.longitude):
+			return
+
+		self.geolocation = frappe.json.dumps(
+			{
+				"type": "FeatureCollection",
+				"features": [
+					{
+						"type": "Feature",
+						"properties": {},
+						# geojson needs coordinates in reverse order: long, lat instead of lat, long
+						"geometry": {"type": "Point", "coordinates": [self.longitude, self.latitude]},
+					}
+				],
+			}
+		)
+
 
 @frappe.whitelist()
 def add_log_based_on_employee_field(
diff --git a/hrms/hr/doctype/employee_checkin/test_employee_checkin.py b/hrms/hr/doctype/employee_checkin/test_employee_checkin.py
index 0b21224ce7..a5cf25fabe 100644
--- a/hrms/hr/doctype/employee_checkin/test_employee_checkin.py
+++ b/hrms/hr/doctype/employee_checkin/test_employee_checkin.py
@@ -38,6 +38,37 @@ def setUp(self):
 		to_date = get_year_ending(getdate())
 		self.holiday_list = make_holiday_list(from_date=from_date, to_date=to_date)
 
+	def test_geolocation_tracking(self):
+		employee = make_employee("test_add_log_based_on_employee_field@example.com")
+		checkin = make_checkin(employee)
+		checkin.latitude = 23.31773
+		checkin.longitude = 66.82876
+		checkin.save()
+
+		# geolocation tracking is disabled
+		self.assertIsNone(checkin.geolocation)
+
+		hr_settings = frappe.get_single("HR Settings")
+		hr_settings.allow_geolocation_tracking = 1
+		hr_settings.save()
+
+		checkin.save()
+		self.assertEqual(
+			checkin.geolocation,
+			frappe.json.dumps(
+				{
+					"type": "FeatureCollection",
+					"features": [
+						{
+							"type": "Feature",
+							"properties": {},
+							"geometry": {"type": "Point", "coordinates": [66.82876, 23.31773]},
+						}
+					],
+				}
+			),
+		)
+
 	def test_add_log_based_on_employee_field(self):
 		employee = make_employee("test_add_log_based_on_employee_field@example.com")
 		employee = frappe.get_doc("Employee", employee)
diff --git a/hrms/hr/doctype/hr_settings/hr_settings.json b/hrms/hr/doctype/hr_settings/hr_settings.json
index c68b84db7a..c4c7464281 100644
--- a/hrms/hr/doctype/hr_settings/hr_settings.json
+++ b/hrms/hr/doctype/hr_settings/hr_settings.json
@@ -47,8 +47,9 @@
   "exit_questionnaire_web_form",
   "column_break_34",
   "exit_questionnaire_notification_template",
-  "mobile_settings_section",
-  "allow_employee_checkin_from_mobile_app"
+  "attendance_settings_section",
+  "allow_employee_checkin_from_mobile_app",
+  "allow_geolocation_tracking"
  ],
  "fields": [
   {
@@ -306,16 +307,22 @@
    "label": "Allow Employee Checkin from Mobile App"
   },
   {
-   "fieldname": "mobile_settings_section",
+   "default": "0",
+   "fieldname": "allow_geolocation_tracking",
+   "fieldtype": "Check",
+   "label": "Allow Geolocation Tracking"
+  },
+  {
+   "fieldname": "attendance_settings_section",
    "fieldtype": "Section Break",
-   "label": "Mobile Settings"
+   "label": "Attendance Settings"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-04-10 14:25:29.958973",
+ "modified": "2024-05-08 00:40:32.809157",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
@@ -329,6 +336,10 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "read": 1,
+   "role": "Employee"
   }
  ],
  "sort_field": "modified",
diff --git a/hrms/hr/doctype/travel_request/travel_request.json b/hrms/hr/doctype/travel_request/travel_request.json
index 7908e1a8ea..ac4f49ac67 100644
--- a/hrms/hr/doctype/travel_request/travel_request.json
+++ b/hrms/hr/doctype/travel_request/travel_request.json
@@ -17,6 +17,7 @@
   "employee_name",
   "cell_number",
   "prefered_email",
+  "company",
   "column_break_7",
   "date_of_birth",
   "personal_id_type",
@@ -212,11 +213,19 @@
   {
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "employee.company",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2022-01-18 19:19:33.678664",
+ "modified": "2024-05-24 17:09:09.480838",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Travel Request",
@@ -237,7 +246,7 @@
   }
  ],
  "search_fields": "employee_name",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "employee_name",
diff --git a/hrms/hr/doctype/travel_request_costing/travel_request_costing.json b/hrms/hr/doctype/travel_request_costing/travel_request_costing.json
index b64b1a9343..ea4b283377 100644
--- a/hrms/hr/doctype/travel_request_costing/travel_request_costing.json
+++ b/hrms/hr/doctype/travel_request_costing/travel_request_costing.json
@@ -1,257 +1,72 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-05-15 10:28:37.429581", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-05-15 10:28:37.429581",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "expense_type",
+  "column_break_2",
+  "sponsored_amount",
+  "funded_amount",
+  "total_amount",
+  "section_break_4",
+  "comments"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Expense Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Expense Claim Type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "expense_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Expense Type",
+   "options": "Expense Claim Type"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sponsored_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Sponsored Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sponsored_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Sponsored Amount",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "funded_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Funded Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "funded_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Funded Amount",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Total Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "total_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Total Amount",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "comments", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Comments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "comments",
+   "fieldtype": "Small Text",
+   "label": "Comments"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-05-15 10:42:07.960530", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Travel Request Costing", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-05-24 12:00:47.413806",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Travel Request Costing",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file