Merge branch 'master' into develop

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 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

@@ -87,8 +87,7 @@ def get_contact_display(contact):
 def get_delivery_notes(customer):
 	return frappe.db.get_all("Delivery Note", filters={
 		'customer': customer,
-		'docstatus': 1,
-		'status': ('!=', 'Completed')
+		'docstatus': 1
 	})
 
 @frappe.whitelist()