feat: fetch leave encashment amount from ssa

frappe · Oct 6, 2024 · 2e36ba5 · 2e36ba5
1 parent 1966adb
commit 2e36ba5
Show file tree

Hide file tree

Showing 2 changed files with 280 additions and 265 deletions.
diff --git a/hrms/hr/doctype/leave_encashment/leave_encashment.py b/hrms/hr/doctype/leave_encashment/leave_encashment.py
@@ -162,7 +162,14 @@ def set_encashment_amount(self):
 			self.set_salary_structure()
 
 		per_day_encashment = frappe.db.get_value(
-			"Salary Structure", self._salary_structure, "leave_encashment_amount_per_day"
+			"Salary Structure Assignment",
+			{
+				"employee": self.employee,
+				"docstatus": 1,
+				"from_date": ("<=", self.encashment_date)
+			},
+			"leave_encashment_amount_per_day",
+			order_by="from_date desc"
 		)
 		self.encashment_amount = self.encashment_days * per_day_encashment if per_day_encashment > 0 else 0