CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-30 09:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Null handling

Browse Source
This commit is contained in:
Nabin Hait
2019-05-01 10:59:02 +05:30
parent 73a081d806
commit 4df46737ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@@ -574,8 +574,8 @@ class SalarySlip(TransactionBase):
def calculate_variable_tax(self, tax_component, payroll_period):
annual_taxable_earning, period_factor = 0, 0
pro_rata_tax_paid, additional_tax_paid, benefit_tax_paid = 0, 0, 0
unclaimed_earning, unclaimed_benefit, additional_income = 0, 0, 0
pro_rata_tax_paid, additional_tax_paid, benefit_tax_paid = 0.0, 0.0, 0.0
unclaimed_earning, unclaimed_benefit, additional_income = 0.0, 0.0, 0.0
# get taxable_earning, additional_income in this slip
taxable_earning = self.get_taxable_earnings()
@@ -687,7 +687,7 @@ class SalarySlip(TransactionBase):
"from_date": from_date,
"to_date": self.start_date
})
return sum_additional_earning[0][0] if sum_additional_earning else 0
return flt(sum_additional_earning[0][0]) if sum_additional_earning else 0
def get_tax_paid_in_period(self, payroll_period, tax_component, only_total=False):
# find total_tax_paid, tax paid for benefit, additional_salary