Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: set correct work experience during gratuity calculation (copy #2460) #2509

Merged
merged 4 commits into from
Dec 17, 2024
Merged

fix: set correct work experience during gratuity calculation (copy #2460) #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1964a5d
fix: set correct work experience for gratuity
AyshaHakeem Nov 27, 2024
efab811
fix: set field level precision for work experience field in gratuity
AyshaHakeem Dec 11, 2024
5c58ad7
chore: remove unused import
ruchamahabal Dec 11, 2024
8c84f5a
chore: fix conflicts
ruchamahabal Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hrms/payroll/doctype/gratuity/gratuity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@
{
"default": "0",
"fieldname": "current_work_experience",
"fieldtype": "Int",
"label": "Current Work Experience"
"fieldtype": "Float",
"label": "Current Work Experience",
"precision": "1"
},
{
"default": "0",
Expand Down Expand Up @@ -199,7 +200,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2024-03-15 02:50:10.282517",
"modified": "2024-12-11 08:46:04.751908",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Gratuity",
Expand Down
5 changes: 1 addition & 4 deletions hrms/payroll/doctype/gratuity/gratuity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(
Expand Down
Loading