[pull] develop from frappe:develop

frontend/src/components/CheckInPanel.vue

@@ -77,11 +77,12 @@
 </template>
 
 <script setup>
-import { createResource, createListResource, toast, FeatherIcon } from "frappe-ui"
+import { createListResource, toast, FeatherIcon } from "frappe-ui"
 import { computed, inject, ref, onMounted, onBeforeUnmount } from "vue"
 import { IonModal, modalController } from "@ionic/vue"
 
 import { formatTimestamp } from "@/utils/formatters"
+import { settings } from "@/data/settings"
 
 const DOCTYPE = "Employee Checkin"
 
@@ -93,10 +94,6 @@ const checkinTimestamp = ref(null)
 const latitude = ref(0)
 const longitude = ref(0)
 const locationStatus = ref("")
-const settings = createResource({
-	url: "hrms.api.get_hr_settings",
-	auto: true,
-})
 
 const checkins = createListResource({
 	doctype: DOCTYPE,

frontend/src/components/RequestActionSheet.vue

@@ -171,6 +171,7 @@ import FilePreviewModal from "@/components/FilePreviewModal.vue"
 import WorkflowActionSheet from "@/components/WorkflowActionSheet.vue"
 
 import { getCompanyCurrency } from "@/data/currencies"
+import { settings } from "@/data/settings"
 import { formatCurrency } from "@/utils/formatters"
 
 import useWorkflow from "@/composables/workflow"
@@ -231,9 +232,16 @@ const permittedWriteFields = createResource({
 	auto: true,
 })
 
+const sessionEmployee = inject("$employee")
+
 function hasPermission(action) {
-	if (action === "approval")
+	if (action === "approval" && props.modelValue.doctype === "Leave Application"){
+		// prevent self leave approval
+		const isSelfLeave = document?.doc?.employee === sessionEmployee?.data?.name 
+		if (isSelfLeave && settings.data?.prevent_self_leave_approval)
+			return false
 		return permittedWriteFields.data?.includes(approvalField.value)
+	}
 	return docPermissions.data?.permissions[action]
 }
 
@@ -337,6 +345,7 @@ const openFormView = () => {
 onMounted(() => {
 	workflow.value = useWorkflow(props.modelValue.doctype)
 })
+
 </script>
 
 <style scoped>

frontend/src/components/RequestList.vue

@@ -37,7 +37,10 @@
 		:initial-breakpoint="1"
 		:breakpoints="[0, 1]"
 	>
-		<RequestActionSheet :fields="fieldsMap[selectedRequest?.doctype]" v-model="selectedRequest" />
+		<RequestActionSheet
+			:fields="fieldsMap[selectedRequest?.doctype]" 
+			v-model="selectedRequest"
+		/>
 	</ion-modal>
 </template>
 

frontend/src/data/settings.js

@@ -0,0 +1,6 @@
+import { createResource } from "frappe-ui"
+
+export const settings = createResource({
+	url: "hrms.api.get_hr_settings",
+	auto: true,
+})

hrms/api/__init__.py

@@ -92,6 +92,7 @@ def get_hr_settings() -> dict:
 	return frappe._dict(
 		allow_employee_checkin_from_mobile_app=settings.allow_employee_checkin_from_mobile_app,
 		allow_geolocation_tracking=settings.allow_geolocation_tracking,
+		prevent_self_leave_approval=settings.prevent_self_leave_approval,
 	)
 
 

hrms/hr/dashboard_chart/appraisal_overview/appraisal_overview.json

@@ -11,15 +11,29 @@
  "idx": 0,
  "is_public": 0,
  "is_standard": 1,
- "modified": "2026-01-10 15:16:33.659637",
+ "modified": "2026-03-26 15:50:08.184379",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Appraisal Overview",
  "number_of_groups": 0,
  "owner": "Administrator",
  "report_name": "Appraisal Overview",
  "roles": [
-  {}
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "HR User"
+  },
+  {
+   "role": "Employee Self Service"
+  },
+  {
+   "role": "Employee"
+  }
  ],
  "show_values_over_chart": 0,
  "time_interval": "Yearly",

hrms/hr/dashboard_chart/claims_by_type/claims_by_type.json

@@ -2,7 +2,7 @@
  "based_on": "",
  "chart_name": "Claims by Type",
  "chart_type": "Group By",
- "creation": "2022-08-31 23:04:43.377345",
+ "creation": "2025-07-15 13:15:12.796881",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
  "document_type": "Expense Claim Detail",
@@ -13,15 +13,26 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "last_synced_on": "2022-09-16 11:36:29.484579",
- "modified": "2022-09-16 11:39:08.205987",
+ "last_synced_on": "2026-03-26 15:47:23.289876",
+ "modified": "2026-03-26 15:47:44.955110",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Claims by Type",
  "number_of_groups": 0,
  "owner": "Administrator",
  "parent_document_type": "Expense Claim",
- "roles": [],
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "HR User"
+  }
+ ],
+ "show_values_over_chart": 0,
  "source": "",
  "time_interval": "Yearly",
  "timeseries": 0,
@@ -30,4 +41,4 @@
  "use_report_chart": 0,
  "value_based_on": "",
  "y_axis": []
-}
+}

hrms/hr/dashboard_chart/employees_by_age/employees_by_age.json

@@ -2,7 +2,7 @@
  "based_on": "",
  "chart_name": "Employees by Age",
  "chart_type": "Custom",
- "creation": "2022-08-22 19:07:51.906347",
+ "creation": "2025-07-15 13:15:12.774524",
  "custom_options": "{\n\t\"colors\": [\"#7cd6fd\"],\n\t\"barOptions\": {\"spaceRatio\": 0.5}\n}",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
@@ -13,15 +13,26 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "last_synced_on": "2022-08-22 19:00:02.464180",
- "modified": "2022-08-22 19:11:20.076166",
+ "last_synced_on": "2026-03-26 15:46:28.262525",
+ "modified": "2026-03-26 15:46:47.145092",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employees by Age",
  "number_of_groups": 0,
  "owner": "Administrator",
  "parent_document_type": "",
- "roles": [],
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "HR User"
+  }
+ ],
+ "show_values_over_chart": 0,
  "source": "Employees by Age",
  "time_interval": "Yearly",
  "timeseries": 0,
@@ -30,4 +41,4 @@
  "use_report_chart": 0,
  "value_based_on": "",
  "y_axis": []
-}
+}

hrms/hr/dashboard_chart/hiring_vs_attrition_count/hiring_vs_attrition_count.json

@@ -2,7 +2,7 @@
  "based_on": "",
  "chart_name": "Hiring vs Attrition Count",
  "chart_type": "Custom",
- "creation": "2022-08-21 22:58:12.740936",
+ "creation": "2025-07-15 13:15:12.786726",
  "custom_options": "{\n\t\"type\": \"axis-mixed\",\n\t\"axisOptions\": {\n\t\t\"xIsSeries\": 1\n\t},\n\t\"lineOptions\": {\n\t    \"regionFill\": 1\n\t},\n\t\"colors\": [\"#7cd6fd\", \"#5e64ff\"]\n}",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
@@ -13,15 +13,26 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "last_synced_on": "2022-08-22 10:57:55.011020",
- "modified": "2022-08-22 11:03:30.080835",
+ "last_synced_on": "2026-03-26 15:45:20.553274",
+ "modified": "2026-03-26 15:46:19.045676",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Hiring vs Attrition Count",
  "number_of_groups": 0,
  "owner": "Administrator",
  "parent_document_type": "",
- "roles": [],
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "HR User"
+  }
+ ],
+ "show_values_over_chart": 0,
  "source": "Hiring vs Attrition Count",
  "time_interval": "Yearly",
  "timeseries": 0,
@@ -30,4 +41,4 @@
  "use_report_chart": 0,
  "value_based_on": "",
  "y_axis": []
-}
+}

hrms/hr/dashboard_chart/timesheet_activity_breakup/timesheet_activity_breakup.json

@@ -3,7 +3,7 @@
  "based_on": "",
  "chart_name": "Timesheet Activity Breakup",
  "chart_type": "Group By",
- "creation": "2022-08-21 14:31:10.401241",
+ "creation": "2025-07-15 13:15:12.817847",
  "docstatus": 0,
  "doctype": "Dashboard Chart",
  "document_type": "Timesheet Detail",
@@ -14,15 +14,29 @@
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
- "last_synced_on": "2022-08-21 17:55:44.318686",
- "modified": "2022-08-21 17:59:38.576219",
+ "last_synced_on": "2026-04-16 17:14:16.020107",
+ "modified": "2026-04-16 17:18:58.677457",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Timesheet Activity Breakup",
  "number_of_groups": 0,
  "owner": "Administrator",
  "parent_document_type": "Timesheet",
- "roles": [],
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "HR Manager"
+  },
+  {
+   "role": "HR User"
+  },
+  {
+   "role": "Employee"
+  }
+ ],
+ "show_values_over_chart": 0,
  "source": "",
  "time_interval": "Yearly",
  "timeseries": 0,
@@ -31,4 +45,4 @@
  "use_report_chart": 0,
  "value_based_on": "",
  "y_axis": []
-}
+}

hrms/hr/doctype/daily_work_summary/daily_work_summary.json

@@ -36,7 +36,7 @@
  ],
  "in_create": 1,
  "links": [],
- "modified": "2024-09-18 13:30:28.136511",
+ "modified": "2026-04-16 12:52:47.429304",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Daily Work Summary",
@@ -46,19 +46,20 @@
    "read": 1,
    "role": "Employee"
   },
+  {
+   "read": 1,
+   "role": "HR User"
+  },
   {
    "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
    "read": 1,
    "report": 1,
-   "role": "HR User",
-   "share": 1
+   "role": "HR Manager"
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

hrms/hr/doctype/employee_onboarding/employee_onboarding.json

@@ -174,7 +174,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2026-02-05 13:46:25.874832",
+ "modified": "2026-03-24 17:13:19.990319",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Onboarding",
@@ -207,6 +207,13 @@
    "share": 1,
    "submit": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "write": 1
   }
  ],
  "row_format": "Dynamic",