Skip to content

Commit 50835cb

Browse files
committed
Merge branch 'hotfix'
2 parents d144a4c + f3a3189 commit 50835cb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

erpnext/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import unicode_literals
33
import frappe
44

5-
__version__ = '8.0.32'
5+
__version__ = '8.0.33'
66

77

88
def get_default_company(user=None):

erpnext/accounts/report/financial_statements.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def sort_root_accounts(roots):
278278
"""Sort root types as Asset, Liability, Equity, Income, Expense"""
279279

280280
def compare_roots(a, b):
281-
if re.split('\W+', a.value)[0].isdigit():
281+
if a.value and re.split('\W+', a.value)[0].isdigit():
282282
# if chart of accounts is numbered, then sort by number
283283
return cmp(a.value, b.value)
284284
if a.report_type != b.report_type and a.report_type == "Balance Sheet":

erpnext/crm/doctype/opportunity/opportunity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def make_new_lead_if_required(self):
7575
self.lead = lead_name
7676

7777
def declare_enquiry_lost(self,arg):
78-
if not self.has_quotation():
78+
if not self.has_lost_quotation():
7979
frappe.db.set(self, 'status', 'Lost')
8080
frappe.db.set(self, 'order_lost_reason', arg)
8181
else:

0 commit comments

Comments
 (0)