nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6784 from RobertSchouten/calendar_fix

Browse Source 
[fix] calendar range fixes
This commit is contained in:
Nabin Hait
2016-11-17 14:45:59 +05:30
committed by GitHub
parent 6d04afc19d e32e2126f4
commit d4e8b297cd
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,13 +408,13 @@ def add_leaves(events, start, end, match_conditions=None):
query = """select name, from_date, to_date, employee_name, half_day,
status, employee, docstatus
from `tabLeave Application` where
(from_date between %s and %s or to_date between %s and %s)
from_date <= %(end)s and to_date >= %(start)s <= to_date
and docstatus < 2
and status!="Rejected" """
if match_conditions:
query += " and " + match_conditions
for d in frappe.db.sql(query, (start, end, start, end), as_dict=True):
for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True):
e = {
"name": d.name,
"doctype": "Leave Application",