patch fixes
diff --git a/erpnext/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py
index 063ed05..09cd6d3 100644
--- a/erpnext/hr/doctype/department/department.py
+++ b/erpnext/hr/doctype/department/department.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
import frappe
-from frappe import _
from frappe.utils.nestedset import NestedSet, get_root_of
from erpnext.utilities.transaction_base import delete_events
from frappe.model.document import Document
@@ -12,7 +11,8 @@
nsm_parent_field = 'parent_department'
def autoname(self):
- if self.department_name != get_root_of("Department"):
+ root = get_root_of("Department")
+ if root and self.department_name != root:
abbr = frappe.db.get_value('Company', self.company, 'abbr')
self.name = '{0} - {1}'.format(self.department_name, abbr)
else:
diff --git a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
index e9c81bf..1735c12 100644
--- a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
+++ b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
@@ -25,13 +25,11 @@
where is_group = 0""".format(_('All Supplier Groups')))
if not frappe.db.exists("Supplier Group", _('All Supplier Groups')):
- supplier_group = frappe.get_doc({
+ frappe.get_doc({
'doctype': 'Supplier Group',
'supplier_group_name': _('All Supplier Groups'),
'is_group': 1,
'parent_supplier_group': ''
- })
- supplier_group.flags.ignore_validate=True
- supplier_group.insert(ignore_permissions=True)
+ }).insert(ignore_permissions=True)
rebuild_tree("Supplier Group", "parent_supplier_group")
diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py
index 533055a..0cb9aec 100644
--- a/erpnext/patches/v11_0/update_department_lft_rgt.py
+++ b/erpnext/patches/v11_0/update_department_lft_rgt.py
@@ -5,15 +5,12 @@
def execute():
""" assign lft and rgt appropriately """
frappe.reload_doc("hr", "doctype", "department")
-
if not frappe.db.exists("Department", _('All Departments')):
- dept = frappe.get_doc({
+ frappe.get_doc({
'doctype': 'Department',
'department_name': _('All Departments'),
'is_group': 1
- })
- dept.flags.ignore_validate=True
- dept.insert(ignore_permissions=True)
+ }).insert(ignore_permissions=True)
frappe.db.sql("""update `tabDepartment` set parent_department = '{0}'
where is_group = 0""".format(_('All Departments')))