Merge branch 'staging-fixes' into staging

This commit is contained in:
Ameya Shenoy 2018-09-26 08:52:54 +00:00
commit a7ae06eadb
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
3 changed files with 3 additions and 3 deletions

View File

@ -16,7 +16,7 @@ class Account(NestedSet):
if frappe.local.flags.ignore_on_update:
return
else:
super().on_update()
super(Account, self).on_update()
def onload(self):
frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",

View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
develop_version = '11.x.x-develop'
staging_version = '11.0.3'
staging_version = '11.0.3-beta.2'
error_report_email = "support@erpnext.com"

View File

@ -18,7 +18,7 @@ def execute():
for department in departments:
# skip root node
if department.name == _("All Departments"):
if _(department.name) == _("All Departments"):
continue
# for each company, create a copy of the doc