nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-15 04:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: calculate amount based on payment days for statistical components too

Browse Source
This commit is contained in:
Rucha Mahabal
2022-09-13 00:59:03 +05:30
parent d29a033c09
commit 3f99522764
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@@ -632,9 +632,19 @@ class SalarySlip(TransactionBase):
continue continue
amount = self.eval_condition_and_formula(struct_row, data) amount = self.eval_condition_and_formula(struct_row, data)
if (
amount or (struct_row.amount_based_on_formula and amount is not None) if struct_row.statistical_component:
) and struct_row.statistical_component == 0: # update statitical component amount in reference data based on payment days
# since row for statistical component is not added to salary slip
if struct_row.depends_on_payment_days:
joining_date, relieving_date = self.get_joining_and_relieving_dates()
default_data[struct_row.abbr] = amount
data[struct_row.abbr] = flt(
(flt(amount) * flt(self.payment_days) / cint(self.total_working_days)),
struct_row.precision("amount"),
)
elif amount or struct_row.amount_based_on_formula and amount is not None:
default_amount = self.eval_condition_and_formula(struct_row, default_data) default_amount = self.eval_condition_and_formula(struct_row, default_data)
self.update_component_row( self.update_component_row(
struct_row, amount, component_type, data=data, default_amount=default_amount struct_row, amount, component_type, data=data, default_amount=default_amount