Merge branch 'master' into develop

This commit is contained in:
Saurabh 2018-02-15 15:17:04 +05:30
commit 82ffdd7dc6
2 changed files with 2 additions and 3 deletions

View File

@ -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'''

View File

@ -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()