Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: component pay calculation

Browse Source
This commit is contained in:
Rucha Mahabal 2022-05-11 16:43:13 +05:30 committed by Nabin Hait
parent 34925a3a8c
commit 2b65c9616f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/salary_structure/salary_structure.py
View File

@ -253,6 +253,7 @@ def make_salary_slip(
source_name, source_name,
target_doc=None, target_doc=None,
employee=None, employee=None,
posting_date=None,
as_print=False, as_print=False,
print_format=None, print_format=None,
for_preview=0, for_preview=0,
@ -269,6 +270,9 @@ def make_salary_slip(
target.designation = employee_details.designation target.designation = employee_details.designation
target.department = employee_details.department target.department = employee_details.department
if posting_date:
target.posting_date = posting_date
target.run_method("process_salary_structure", for_preview=for_preview) target.run_method("process_salary_structure", for_preview=for_preview)
doc = get_mapped_doc( doc = get_mapped_doc(

20
erpnext/regional/india/utils.py
View File

@ -422,8 +422,8 @@ def calculate_annual_eligible_hra_exemption(doc):
return frappe._dict( return frappe._dict(
{ {
"hra_amount": hra_amount, "hra_amount": hra_amount,
"annual_exemption": annual_exemption, "annual_exemption": flt(annual_exemption, doc.precision("annual_hra_exemption")),
"monthly_exemption": monthly_exemption, "monthly_exemption": flt(monthly_exemption, doc.precision("monthly_hra_exemption")),
} }
) )
@ -459,12 +459,12 @@ def get_component_amt_from_salary_slip(
employee, salary_structure, basic_component, hra_component, from_date employee, salary_structure, basic_component, hra_component, from_date
): ):
salary_slip = make_salary_slip( salary_slip = make_salary_slip(
salary_structure, employee=employee, for_preview=1, ignore_permissions=True salary_structure,
employee=employee,
for_preview=1,
ignore_permissions=True,
posting_date=from_date,
) )
# generate salary slip as per assignment on "from_date"
salary_slip.posting_date = from_date
salary_slip.start_date = salary_slip.end_date = None
salary_slip.run_method("process_salary_structure", for_preview=True)
basic_amt, hra_amt = 0, 0 basic_amt, hra_amt = 0, 0
for earning in salary_slip.earnings: for earning in salary_slip.earnings:
@ -502,13 +502,13 @@ def get_component_pay(frequency, amount, from_date, to_date):
if frequency == "Daily": if frequency == "Daily":
return amount * days return amount * days
elif frequency == "Weekly": elif frequency == "Weekly":
return amount * math.ceil(days / 7) return amount * math.floor(days / 7)
elif frequency == "Fortnightly": elif frequency == "Fortnightly":
return amount * math.ceil(days / 15) return amount * math.floor(days / 14)
elif frequency == "Monthly": elif frequency == "Monthly":
return amount * month_diff(to_date, from_date) return amount * month_diff(to_date, from_date)
elif frequency == "Bimonthly": elif frequency == "Bimonthly":
return amount * math.ceil(days / 60) return amount * (month_diff(to_date, from_date) / 2)
def validate_house_rent_dates(doc): def validate_house_rent_dates(doc):