Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-fixes

Browse Source
This commit is contained in:
Saurabh 2018-10-09 17:55:33 +05:30
commit 99c064305f
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

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

1
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

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

2
erpnext/setup/setup_wizard/operations/taxes_setup.py
View File

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