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

fix: future recurring period calculation (#29083)

Browse Source 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
Nabin Hait 2022-01-04 11:38:49 +05:30 committed by GitHub
parent 7e777356ee
commit 11cfa16158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -932,8 +932,11 @@ class SalarySlip(TransactionBase):
def get_future_recurring_additional_amount(self, additional_salary, monthly_additional_amount): def get_future_recurring_additional_amount(self, additional_salary, monthly_additional_amount):
future_recurring_additional_amount = 0 future_recurring_additional_amount = 0
to_date = frappe.db.get_value("Additional Salary", additional_salary, 'to_date') to_date = frappe.db.get_value("Additional Salary", additional_salary, 'to_date')
# future month count excluding current # future month count excluding current
future_recurring_period = (getdate(to_date).month - getdate(self.start_date).month) from_date, to_date = getdate(self.start_date), getdate(to_date)
future_recurring_period = ((to_date.year - from_date.year) * 12) + (to_date.month - from_date.month)
if future_recurring_period > 0: if future_recurring_period > 0:
future_recurring_additional_amount = monthly_additional_amount * future_recurring_period # Used earning.additional_amount to consider the amount for the full month future_recurring_additional_amount = monthly_additional_amount * future_recurring_period # Used earning.additional_amount to consider the amount for the full month
return future_recurring_additional_amount return future_recurring_additional_amount
@ -1032,7 +1035,8 @@ class SalarySlip(TransactionBase):
data.update({"annual_taxable_earning": annual_taxable_earning}) data.update({"annual_taxable_earning": annual_taxable_earning})
tax_amount = 0 tax_amount = 0
for slab in tax_slab.slabs: for slab in tax_slab.slabs:
if slab.condition and not self.eval_tax_slab_condition(slab.condition, data): cond = cstr(slab.condition).strip()
if cond and not self.eval_tax_slab_condition(cond, data):
continue continue
if not slab.to_amount and annual_taxable_earning >= slab.from_amount: if not slab.to_amount and annual_taxable_earning >= slab.from_amount:
tax_amount += (annual_taxable_earning - slab.from_amount + 1) * slab.percent_deduction *.01 tax_amount += (annual_taxable_earning - slab.from_amount + 1) * slab.percent_deduction *.01