From d54e2229e7046a6fa6e73ae645833a12f5715d12 Mon Sep 17 00:00:00 2001
From: Asmita Hase <44727809+asmitahase@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:15:38 +0530
Subject: [PATCH 1/2] fix(Additional Salary): amount gets overwritten by salary
 component amount even if mapped from a reference document (#2420)

(cherry picked from commit a53a9a7a3ef8ec3d18720c2805f8ef1894591d51)

# Conflicts:
#	hrms/payroll/doctype/additional_salary/additional_salary.json
---
 .../additional_salary/additional_salary.js    | 24 +++++++++++++++++++
 .../additional_salary/additional_salary.json  |  6 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/hrms/payroll/doctype/additional_salary/additional_salary.js b/hrms/payroll/doctype/additional_salary/additional_salary.js
index fa74380ab3..af2362ad20 100644
--- 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
index 8a33942e29..255409a05f 100644
--- 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,11 @@
  ],
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-03-14 10:31:03.071277",
+=======
+ "modified": "2024-11-14 16:51:17.594568",
+>>>>>>> a53a9a7a3 (fix(Additional Salary): amount gets overwritten by salary component amount even if mapped from a reference document (#2420))
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Additional Salary",

From e1e095cefc1a26e1959ede811bdb3c85b79ecfac Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 19 Nov 2024 15:17:24 +0530
Subject: [PATCH 2/2] chore: fix conflicts

---
 hrms/payroll/doctype/additional_salary/additional_salary.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hrms/payroll/doctype/additional_salary/additional_salary.json b/hrms/payroll/doctype/additional_salary/additional_salary.json
index 255409a05f..ec5c60ca6c 100644
--- a/hrms/payroll/doctype/additional_salary/additional_salary.json
+++ b/hrms/payroll/doctype/additional_salary/additional_salary.json
@@ -203,11 +203,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-03-14 10:31:03.071277",
-=======
  "modified": "2024-11-14 16:51:17.594568",
->>>>>>> a53a9a7a3 (fix(Additional Salary): amount gets overwritten by salary component amount even if mapped from a reference document (#2420))
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Additional Salary",