From c2710e05ce97f65b602ab2757293b2d8ebb4c611 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Wed, 12 Aug 2020 13:35:25 +0530 Subject: [PATCH] fix: showing on_going shift on calendar --- erpnext/hr/doctype/shift_assignment/shift_assignment.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.py b/erpnext/hr/doctype/shift_assignment/shift_assignment.py index 4f5b59b7e2..f8b73349c1 100644 --- a/erpnext/hr/doctype/shift_assignment/shift_assignment.py +++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.py @@ -91,11 +91,13 @@ def add_assignments(events, start, end, conditions=None): employee, docstatus from `tabShift Assignment` where start_date >= %(start_date)s - and docstatus < 2""".format() + or end_date <= %(end_date)s + or (%(start_date)s between start_date and end_date and %(end_date)s between start_date and end_date) + and docstatus = 1""" if conditions: query += conditions - for d in frappe.db.sql(query, {"start_date":start}, as_dict=True): + for d in frappe.db.sql(query, {"start_date":start, "end_date":end}, as_dict=True): e = { "name": d.name, "doctype": "Shift Assignment",