From 177a26849dd0e140fe1c54ecab85ce88cc16c2fc Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 19 May 2017 18:56:25 +0530 Subject: [PATCH 1/3] [fix] Trial balance not working (#8937) --- erpnext/accounts/report/financial_statements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index f6a032cb45..270ad53280 100644 --- 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": From 529f5ce503e52888ec88bf6c12c2ad36b954d374 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 19 May 2017 18:56:54 +0530 Subject: [PATCH 2/3] [fix] Not able to change the status as Lost in opportunity (#8938) --- erpnext/crm/doctype/opportunity/opportunity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py index 8a21e7c746..8c695ed4c0 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.py +++ b/erpnext/crm/doctype/opportunity/opportunity.py @@ -75,7 +75,7 @@ class Opportunity(TransactionBase): 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: From f3a318921f60c3b21f5ab923c8b7788894937819 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 19 May 2017 19:54:42 +0600 Subject: [PATCH 3/3] bumped to version 8.0.33 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 35952377c1..22180065b3 100644 --- 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):