nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 01:43:10 +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

6
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@@ -523,9 +523,9 @@ def get_events(start, end, filters=None):
planned_end_date, status
from `tabProduction Order`
where ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
and (planned_start_date between %(start)s and %(end)s) \
or ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
and planned_end_date between %(start)s and %(end)s)) {conditions}
and (planned_start_date <= %(end)s) \
and ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
and planned_end_date >= %(start)s)) {conditions}
""".format(conditions=conditions), {
"start": start,
"end": end