diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 0b61c90dec..e9bdbf94a3 100644 --- a/erpnext/__init__.py +++ b/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''' diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 647ba9787b..f54ff48622 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/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", diff --git a/erpnext/setup/setup_wizard/operations/taxes_setup.py b/erpnext/setup/setup_wizard/operations/taxes_setup.py index 8bcec5235b..e66fa76f93 100644 --- a/erpnext/setup/setup_wizard/operations/taxes_setup.py +++ b/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