commit db6f0848e36e1bd6dd5acb0ee09b66af23c0431e
author Saurabh <saurabh6790@gmail.com> Thu Feb 15 15:17:03 2018 +0530
committer Saurabh <saurabh6790@gmail.com> Thu Feb 15 15:17:03 2018 +0530
tree 5f3514a7f710fc83b017992d52d1392500bd104c
parent 0500ce445fa2047baa85d4f75916256b19c50e45
parent ca166eaae5c7bd6c8e4467178da2402dde866b45

Merge branch 'hotfix'

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 6c8d7c8..a16794b 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.0.22'
+__version__ = '10.0.23'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/stock/doctype/delivery_trip/delivery_trip.py

diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index b5de330..7599cd2 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -87,8 +87,7 @@
 def get_delivery_notes(customer):
 	return frappe.db.get_all("Delivery Note", filters={
 		'customer': customer,
-		'docstatus': 1,
-		'status': ('!=', 'Completed')
+		'docstatus': 1
 	})
 
 @frappe.whitelist()