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

get payroll period days - fix

Browse Source
This commit is contained in:
Jamsheer 2018-05-25 11:04:21 +05:30
parent 47d865baa0
commit 16e924333e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/payroll_period/payroll_period.py
View File

@ -49,7 +49,9 @@ def get_payroll_period_days(start_date, end_date, company):
select start_date, end_date from `tabPayroll Period` select start_date, end_date from `tabPayroll Period`
where company=%(company)s where company=%(company)s
and ( and (
start_date between %(start_date)s and %(end_date)s (%(start_date)s between start_date and end_date)
or (%(end_date)s between start_date and end_date)
or (start_date between %(start_date)s and %(end_date)s)
)""", { )""", {
'company': company, 'company': company,
'start_date': start_date, 'start_date': start_date,