Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2018-02-15 15:17:03 +05:30
commit db6f0848e3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.0.22' __version__ = '10.0.23'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

3
erpnext/stock/doctype/delivery_trip/delivery_trip.py
View File

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