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

skip abbr, reload doc, disable edit for root department node'

Browse Source
This commit is contained in:
Zlash65 2018-05-15 12:59:27 +05:30
parent 62a59301ef
commit 99e72af089
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/hr/doctype/department/department.js
View File

@ -2,7 +2,16 @@
// For license information, please see license.txt
frappe.ui.form.on('Department', {
onload: function(frm) {
refresh: function(frm) {
// read-only for root department
if(!frm.doc.parent_department) {
cur_frm.set_read_only();
cur_frm.set_intro(__("This is a root customer group and cannot be edited."));
}
},
validate: function(frm) {
if(frm.doc.name=="All Departments") {
frappe.throw(__("You cannot edit root node."));
}
}
});

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

@ -11,8 +11,11 @@ class Department(NestedSet):
nsm_parent_field = 'parent_department'
def autoname(self):
abbr = frappe.db.get_value('Company', self.company, 'abbr')
self.name = '{0} - {1}'.format(self.department_name, abbr)
if not self.department_name=="All Departments":
abbr = frappe.db.get_value('Company', self.company, 'abbr')
self.name = '{0} - {1}'.format(self.department_name, abbr)
else:
self.name = self.department_name
def update_nsm_model(self):
frappe.utils.nestedset.update_nsm(self)

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

@ -2,7 +2,7 @@ import frappe
from frappe.utils.nestedset import rebuild_tree
def execute():
for doctype in ['department', 'leave_period', 'staffing_plan']:
for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening']:
frappe.reload_doc("hr", "doctype", doctype)
companies = frappe.db.get_all("Company", fields=["name", "abbr"])