nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging-fixes' into staging

Browse Source
This commit is contained in:
Ameya Shenoy
2018-09-26 08:52:54 +00:00
parent 47b82789ae 90197dd341
commit fae3d68e66
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/account/account.py
View File

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

2
erpnext/hooks.py
View File

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

2
erpnext/patches/v11_0/create_department_records_for_each_company.py
View File

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