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

fix: TreeView fixes

Browse Source
This commit is contained in:
Himanshu Warekar 2019-08-05 14:21:09 +05:30
parent 9601b6c601
commit e8f95a2adf
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
View File

@ -1,11 +1,11 @@
{ {
"autoname": "format:PRC-{procedure}", "autoname": "format:PRC-{quality_procedure_name}",
"creation": "2018-10-06 00:06:29.756804", "creation": "2018-10-06 00:06:29.756804",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"procedure", "quality_procedure_name",
"parent_quality_procedure", "parent_quality_procedure",
"is_group", "is_group",
"sb_00", "sb_00",
@ -62,14 +62,14 @@
"options": "Quality Procedure Process" "options": "Quality Procedure Process"
}, },
{ {
"fieldname": "procedure", "fieldname": "quality_procedure_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"label": "Procedure", "label": "Quality Procedure",
"reqd": 1 "reqd": 1
} }
], ],
"modified": "2019-05-26 22:11:53.771428", "modified": "2019-08-05 13:09:29.945082",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Quality Management", "module": "Quality Management",
"name": "Quality Procedure", "name": "Quality Procedure",

6
erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
View File

@ -36,11 +36,9 @@ class QualityProcedure(NestedSet):
doc.load_from_db() doc.load_from_db()
for process in doc.processes: for process in doc.processes:
if process.procedure: flag_is_group = 1 if process.procedure else 0
flag_is_group = 1
if flag_is_group == 0: doc.is_group = 0 if flag_is_group == 0 else 1
doc.is_group = 0
doc.save(ignore_permissions=True) doc.save(ignore_permissions=True)
def set_parent(self): def set_parent(self):

8
erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
View File

@ -6,7 +6,7 @@ frappe.treeview_settings["Quality Procedure"] = {
add_tree_node: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.add_node', add_tree_node: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.add_node',
filters: [ filters: [
{ {
fieldname: "Quality Procedure", fieldname: "quality_procedure",
fieldtype: "Link", fieldtype: "Link",
options: "Quality Procedure", options: "Quality Procedure",
label: __("Quality Procedure"), label: __("Quality Procedure"),
@ -19,7 +19,7 @@ frappe.treeview_settings["Quality Procedure"] = {
], ],
breadcrumb: "Setup", breadcrumb: "Setup",
root_label: "All Quality Procedures", root_label: "All Quality Procedures",
get_tree_root: false, get_tree_root: true,
menu_items: [ menu_items: [
{ {
label: __("New Quality Procedure"), label: __("New Quality Procedure"),
@ -32,8 +32,4 @@ frappe.treeview_settings["Quality Procedure"] = {
onload: function(treeview) { onload: function(treeview) {
treeview.make_tree(); treeview.make_tree();
}, },
onrender: function() {
$("button:contains('Add Child')").remove();
$("button:contains('New')").remove();
}
}; };