Merge branch 'master' into staging-fixes

erpnext/__init__.py

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

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -111,7 +111,6 @@ class ReceivablePayableReport(object):
 				"width": 100,
 			})
 			columns += [_("Delivery Note") + ":Data:100"]
-
 		if args.get("party_type") == "Customer":
 			columns += [
 				_("Territory") + ":Link/Territory:80",

erpnext/setup/setup_wizard/operations/taxes_setup.py

@@ -30,7 +30,7 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name
 		if accounts:
 			make_sales_and_purchase_tax_templates(accounts, template_name)
 	except frappe.NameError:
-		frappe.message_log.pop()
+		if frappe.message_log: frappe.message_log.pop()
 	except RootNotEditable:
 		pass