Merge pull request #2460 from AyshaHakeem/support-gratuity

fix: set correct work experience during gratuity calculation
frappe · Dec 12, 2024 · 7fc1c2c · 7fc1c2c
2 parents 9e27200 + da17577
commit 7fc1c2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/hrms/payroll/doctype/gratuity/gratuity.json b/hrms/payroll/doctype/gratuity/gratuity.json
@@ -60,7 +60,8 @@
    "default": "0",
    "fieldname": "current_work_experience",
    "fieldtype": "Float",
-   "label": "Current Work Experience"
+   "label": "Current Work Experience",
+   "precision": "1"
   },
   {
    "default": "0",
@@ -199,7 +200,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-10-25 15:33:11.549493",
+ "modified": "2024-12-11 08:46:04.751908",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Gratuity",

diff --git a/hrms/payroll/doctype/gratuity/gratuity.py b/hrms/payroll/doctype/gratuity/gratuity.py
@@ -1,9 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
-from math import floor
-
 import frappe
 from frappe import _, bold
 from frappe.query_builder.functions import Sum
@@ -159,7 +156,7 @@ def get_work_experience(self) -> float:
 		if rule.method == "Round off Work Experience":
 			work_experience = round(work_experience)
 		else:
-			work_experience = floor(work_experience)
+			work_experience = flt(work_experience, self.precision("current_work_experience"))
 
 		if work_experience < rule.minimum_year_for_gratuity:
 			frappe.throw(