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

fix(QMS): TreeView fixes (#18595)

Browse Source 
* fix: TreeView fixes

* test: test case fix
This commit is contained in:
Himanshu 2019-08-13 11:58:42 +05:30 committed by Anurag Mishra
parent 80afee04a4
commit 7df50b6ec7
4 changed files with 13 additions and 19 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",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"procedure",
"quality_procedure_name",
"parent_quality_procedure",
"is_group",
"sb_00",
@ -62,14 +62,14 @@
"options": "Quality Procedure Process"
},
{
"fieldname": "procedure",
"fieldname": "quality_procedure_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Procedure",
"label": "Quality Procedure",
"reqd": 1
}
],
"modified": "2019-05-26 22:11:53.771428",
"modified": "2019-08-05 13:09:29.945082",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality Procedure",

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

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

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

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

4
erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py
View File

@ -18,7 +18,7 @@ class TestQualityProcedure(unittest.TestCase):
def create_procedure():
procedure = frappe.get_doc({
"doctype": "Quality Procedure",
"procedure": "_Test Quality Procedure",
"quality_procedure_name": "_Test Quality Procedure",
"processes": [
{
"process_description": "_Test Quality Procedure Table",
@ -37,7 +37,7 @@ def create_procedure():
def create_nested_procedure():
nested_procedure = frappe.get_doc({
"doctype": "Quality Procedure",
"procedure": "_Test Nested Quality Procedure",
"quality_procedure_name": "_Test Nested Quality Procedure",
"processes": [
{
"procedure": "PRC-_Test Quality Procedure"