| commit | 99c064305ff29713757d83bf0c72e828a2cbcece | [log] [tgz] |
|---|---|---|
| author | Saurabh <saurabh6790@gmail.com> | Tue Oct 09 17:55:33 2018 +0530 |
| committer | Saurabh <saurabh6790@gmail.com> | Tue Oct 09 17:55:33 2018 +0530 |
| tree | 4ab9e4379b47192086074c1e472061d04ecc6bcd | |
| parent | 8a4bcefec46756f52710f0cee06bc9ea7cae9604 [diff] | |
| parent | 75c1682e6124b28542c14246ff7a8525188c0fff [diff] |
Merge branch 'master' into staging-fixes
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 0b61c90..e9bdbf9 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@ 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 647ba97..f54ff48 100755 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -111,7 +111,6 @@ "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 8bcec52..e66fa76 100644 --- a/erpnext/setup/setup_wizard/operations/taxes_setup.py +++ b/erpnext/setup/setup_wizard/operations/taxes_setup.py
@@ -30,7 +30,7 @@ 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