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

Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13

Browse Source 
fix: Consider only submitted salary slips
This commit is contained in:
Deepesh Garg 2021-01-06 09:30:00 +05:30 committed by GitHub
commit f2863f9d16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,11 +429,11 @@ class SalarySlip(TransactionBase):
if self.salary_structure: if self.salary_structure:
self.calculate_component_amounts("deductions") self.calculate_component_amounts("deductions")
self.set_loan_repayment() self.set_loan_repayment()
self.set_component_amounts_based_on_payment_days() self.set_component_amounts_based_on_payment_days()
self.set_net_pay() self.set_net_pay()
def set_net_pay(self): def set_net_pay(self):
self.total_deduction = self.get_component_totals("deductions") self.total_deduction = self.get_component_totals("deductions")
self.base_total_deduction = flt(flt(self.total_deduction) * flt(self.exchange_rate), self.precision('base_total_deduction')) self.base_total_deduction = flt(flt(self.total_deduction) * flt(self.exchange_rate), self.precision('base_total_deduction'))
@ -1154,10 +1154,10 @@ class SalarySlip(TransactionBase):
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', period_start_date], 'start_date' : ['>=', period_start_date],
'end_date' : ['<', period_end_date], 'end_date' : ['<', period_end_date],
'name': ['!=', self.name] 'name': ['!=', self.name],
'docstatus': 1
}) })
year_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0 year_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0
year_to_date += self.net_pay year_to_date += self.net_pay
@ -1171,7 +1171,8 @@ class SalarySlip(TransactionBase):
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', first_day_of_the_month], 'start_date' : ['>=', first_day_of_the_month],
'end_date' : ['<', self.start_date], 'end_date' : ['<', self.start_date],
'name': ['!=', self.name] 'name': ['!=', self.name],
'docstatus': 1
}) })
month_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0 month_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0