Merge pull request #2428 from frappe/version-15-hotfix

frappe · Nov 20, 2024 · 19e576d · 19e576d
2 parents cb29080 + 072e953
commit 19e576d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/frontend/src/views/attendance/AttendanceRequestList.vue b/frontend/src/views/attendance/AttendanceRequestList.vue
@@ -12,6 +12,9 @@
 <script setup>
 import { IonPage } from "@ionic/vue"
 import ListView from "@/components/ListView.vue"
+import { inject } from "vue"
+
+const __ = inject("$translate")
 
 const ATTENDANCE_REQUEST_FIELDS = ["name", "reason", "from_date", "to_date", "docstatus"]
 const FILTER_CONFIG = [

diff --git a/frontend/src/views/attendance/EmployeeCheckinList.vue b/frontend/src/views/attendance/EmployeeCheckinList.vue
@@ -12,6 +12,9 @@
 <script setup>
 import { IonPage } from "@ionic/vue"
 import ListView from "@/components/ListView.vue"
+import { inject } from "vue"
+
+const __ = inject("$translate")
 
 const EMPLOYEE_CHECKIN_FIELDS = ["name", "log_type", "time", "latitude", "longitude"]
 

diff --git a/hrms/payroll/doctype/additional_salary/additional_salary.js b/hrms/payroll/doctype/additional_salary/additional_salary.js
@@ -86,4 +86,28 @@ frappe.ui.form.on("Additional Salary", {
 			},
 		});
 	},
+
+	salary_component: function (frm) {
+		if (!frm.doc.ref_doctype) {
+			frm.trigger("get_salary_component_amount");
+		}
+	},
+
+	get_salary_component_amount: function (frm) {
+		frappe.call({
+			method: "frappe.client.get_value",
+			args: {
+				doctype: "Salary Component",
+				fieldname: "amount",
+				filters: {
+					name: frm.doc.salary_component,
+				},
+			},
+			callback: function (data) {
+				if (data.message) {
+					frm.set_value("amount", data.message.amount);
+				}
+			},
+		});
+	},
 });
diff --git a/hrms/payroll/doctype/additional_salary/additional_salary.json b/hrms/payroll/doctype/additional_salary/additional_salary.json
@@ -60,8 +60,6 @@
    "search_index": 1
   },
   {
-   "fetch_from": "salary_component.amount",
-   "fetch_if_empty": 1,
    "fieldname": "amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
@@ -205,7 +203,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-03-14 10:31:03.071277",
+ "modified": "2024-11-14 16:51:17.594568",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Additional Salary",