From d4d1f1b036fcf05ff055f08471a0c5bb0d776c71 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Tue, 26 Jul 2016 03:33:38 -0700 Subject: [PATCH] Added date filters for the Timesheet query in Salary Slip --- erpnext/hr/doctype/salary_slip/salary_slip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 1d657dc0b8..f83d1448ec 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -64,8 +64,8 @@ class SalarySlip(TransactionBase): if self.salary_slip_based_on_timesheet and not self.get('timesheets'): self.set("timesheets", []) - timesheets = frappe.db.sql(""" select * from `tabTimesheet` where employee = %(employee)s and (status = 'Submitted' or - status = 'Billed')""", {'employee': self.employee}, as_dict=1) + timesheets = frappe.db.sql(""" select * from `tabTimesheet` where employee = %(employee)s and start_date BETWEEN %(start_date)s AND %(end_date)s and (status = 'Submitted' or + status = 'Billed')""", {'employee': self.employee, 'start_date': self.start_date, 'end_date': self.end_date}, as_dict=1) for data in timesheets: self.append('timesheets', {