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

patch fixes

Browse Source
This commit is contained in:
Nabin Hait 2018-05-29 16:17:06 +05:30
parent 13d4391e70
commit 348a6a8b17
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/department/department.py
View File

@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _
from frappe.utils.nestedset import NestedSet, get_root_of from frappe.utils.nestedset import NestedSet, get_root_of
from erpnext.utilities.transaction_base import delete_events from erpnext.utilities.transaction_base import delete_events
from frappe.model.document import Document from frappe.model.document import Document
@ -12,7 +11,8 @@ class Department(NestedSet):
nsm_parent_field = 'parent_department' nsm_parent_field = 'parent_department'
def autoname(self): 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') abbr = frappe.db.get_value('Company', self.company, 'abbr')
self.name = '{0} - {1}'.format(self.department_name, abbr) self.name = '{0} - {1}'.format(self.department_name, abbr)
else: else:

6
erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
View File

@ -25,13 +25,11 @@ def build_tree():
where is_group = 0""".format(_('All Supplier Groups'))) where is_group = 0""".format(_('All Supplier Groups')))
if not frappe.db.exists("Supplier Group", _('All Supplier Groups')): if not frappe.db.exists("Supplier Group", _('All Supplier Groups')):
supplier_group = frappe.get_doc({ frappe.get_doc({
'doctype': 'Supplier Group', 'doctype': 'Supplier Group',
'supplier_group_name': _('All Supplier Groups'), 'supplier_group_name': _('All Supplier Groups'),
'is_group': 1, 'is_group': 1,
'parent_supplier_group': '' 'parent_supplier_group': ''
}) }).insert(ignore_permissions=True)
supplier_group.flags.ignore_validate=True
supplier_group.insert(ignore_permissions=True)
rebuild_tree("Supplier Group", "parent_supplier_group") rebuild_tree("Supplier Group", "parent_supplier_group")

7
erpnext/patches/v11_0/update_department_lft_rgt.py
View File

@ -5,15 +5,12 @@ from frappe.utils.nestedset import rebuild_tree
def execute(): def execute():
""" assign lft and rgt appropriately """ """ assign lft and rgt appropriately """
frappe.reload_doc("hr", "doctype", "department") frappe.reload_doc("hr", "doctype", "department")
if not frappe.db.exists("Department", _('All Departments')): if not frappe.db.exists("Department", _('All Departments')):
dept = frappe.get_doc({ frappe.get_doc({
'doctype': 'Department', 'doctype': 'Department',
'department_name': _('All Departments'), 'department_name': _('All Departments'),
'is_group': 1 'is_group': 1
}) }).insert(ignore_permissions=True)
dept.flags.ignore_validate=True
dept.insert(ignore_permissions=True)
frappe.db.sql("""update `tabDepartment` set parent_department = '{0}' frappe.db.sql("""update `tabDepartment` set parent_department = '{0}'
where is_group = 0""".format(_('All Departments'))) where is_group = 0""".format(_('All Departments')))