| commit | 41d1982b902cd5217d755b935ff6e9d702a6cfb4 | [log] [tgz] |
|---|---|---|
| author | Ameya Shenoy <shenoy.ameya@gmail.com> | Wed Sep 26 14:12:01 2018 +0530 |
| committer | GitHub <noreply@github.com> | Wed Sep 26 14:12:01 2018 +0530 |
| tree | f2b4e199452e67bfd4fc19349bbd5d6afebaf2e6 | |
| parent | 47b82789aeff6cf9f0d3b7a9364167dc5ff5e235 [diff] | |
| parent | 12ec142a691d807bbd13d11e05a729bf596006a7 [diff] |
Merge pull request #15501 from codingCoffee/qwe fix(multiple): syntax and patch
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index 635a8c2..5d504b9 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py
@@ -16,7 +16,7 @@ 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",
diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py index c03cf98..eb48eed 100644 --- a/erpnext/patches/v11_0/create_department_records_for_each_company.py +++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py
@@ -18,7 +18,7 @@ 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