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

Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip

Browse Source 
[Minor] From date, To date based on Payroll Frequency
This commit is contained in:
Nabin Hait 2017-03-23 16:16:51 +05:30 committed by GitHub
commit 422ef584fa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,10 +148,9 @@ class SalarySlip(TransactionBase):
})
def get_date_details(self):
if not self.end_date:
date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date)
self.start_date = date_details.start_date
self.end_date = date_details.end_date
date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date)
self.start_date = date_details.start_date
self.end_date = date_details.end_date
def check_sal_struct(self, joining_date, relieving_date):
cond = ''