Merge branch 'hotfix'

frappe · May 19, 2017 · 50835cb · 50835cb
2 parents d144a4c + f3a3189
commit 50835cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.32'
+__version__ = '8.0.33'
 
 
 def get_default_company(user=None):

diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
@@ -278,7 +278,7 @@ def sort_root_accounts(roots):
 	"""Sort root types as Asset, Liability, Equity, Income, Expense"""
 
 	def compare_roots(a, b):
-		if re.split('\W+', a.value)[0].isdigit():
+		if a.value and re.split('\W+', a.value)[0].isdigit():
 			# if chart of accounts is numbered, then sort by number
 			return cmp(a.value, b.value)
 		if a.report_type != b.report_type and a.report_type == "Balance Sheet":

diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -75,7 +75,7 @@ def make_new_lead_if_required(self):
 			self.lead = lead_name
 
 	def declare_enquiry_lost(self,arg):
-		if not self.has_quotation():
+		if not self.has_lost_quotation():
 			frappe.db.set(self, 'status', 'Lost')
 			frappe.db.set(self, 'order_lost_reason', arg)
 		else: