From 084eee634d66fcea6361a5567d955b8b20469ead Mon Sep 17 00:00:00 2001
From: Asmita Hase <44727809+asmitahase@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:35:50 +0530
Subject: [PATCH 1/2] feat: allow fractional values for "Current Work
 Experience" field in gratuity doctype (#2340)

(cherry picked from commit 08984a6612fb31a38782a6d6967070caed6acf20)

# Conflicts:
#	hrms/payroll/doctype/gratuity/gratuity.json
---
 hrms/payroll/doctype/gratuity/gratuity.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hrms/payroll/doctype/gratuity/gratuity.json b/hrms/payroll/doctype/gratuity/gratuity.json
index a58b6a196e..7fe3852e72 100644
--- a/hrms/payroll/doctype/gratuity/gratuity.json
+++ b/hrms/payroll/doctype/gratuity/gratuity.json
@@ -59,7 +59,7 @@
   {
    "default": "0",
    "fieldname": "current_work_experience",
-   "fieldtype": "Int",
+   "fieldtype": "Float",
    "label": "Current Work Experience"
   },
   {
@@ -199,7 +199,11 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2024-03-27 13:09:45.947818",
+=======
+ "modified": "2024-10-25 15:33:11.549493",
+>>>>>>> 08984a661 (feat: allow fractional values for "Current Work Experience" field in gratuity doctype (#2340))
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Gratuity",

From 9d877d70ff99ae5c170158c6c8439bb4e134c426 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Fri, 25 Oct 2024 16:40:05 +0530
Subject: [PATCH 2/2] chore: fix conflicts

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

diff --git a/hrms/payroll/doctype/gratuity/gratuity.json b/hrms/payroll/doctype/gratuity/gratuity.json
index 7fe3852e72..5da6c87c81 100644
--- a/hrms/payroll/doctype/gratuity/gratuity.json
+++ b/hrms/payroll/doctype/gratuity/gratuity.json
@@ -199,11 +199,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-27 13:09:45.947818",
-=======
  "modified": "2024-10-25 15:33:11.549493",
->>>>>>> 08984a661 (feat: allow fractional values for "Current Work Experience" field in gratuity doctype (#2340))
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Gratuity",