From 9a7e433a9d97190e44615a291f7137b420a0ede4 Mon Sep 17 00:00:00 2001 From: Anupam Date: Tue, 22 Sep 2020 13:00:09 +0530 Subject: [PATCH 1/2] fix: quality procedure parent --- .../doctype/quality_procedure/quality_procedure.js | 8 ++++++++ .../doctype/quality_procedure/quality_procedure.json | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js index cf2644e0053..ac876229ecb 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js @@ -10,5 +10,13 @@ frappe.ui.form.on('Quality Procedure', { } }; }); + + frm.set_query('parent_quality_procedure', function(){ + return { + filters: { + is_group: 1 + } + }; + }); } }); \ No newline at end of file diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json index b3c0d948909..1dc4660c44d 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -1,5 +1,4 @@ { - "actions": [], "allow_rename": 1, "autoname": "format:PRC-{quality_procedure_name}", "creation": "2018-10-06 00:06:29.756804", @@ -18,11 +17,11 @@ ], "fields": [ { + "depends_on": "eval: doc.is_group == 0", "fieldname": "parent_quality_procedure", "fieldtype": "Link", "label": "Parent Procedure", - "options": "Quality Procedure", - "read_only": 1 + "options": "Quality Procedure" }, { "default": "0", @@ -72,8 +71,7 @@ } ], "is_tree": 1, - "links": [], - "modified": "2020-06-17 17:25:03.434953", + "modified": "2020-09-22 12:56:50.700777", "modified_by": "Administrator", "module": "Quality Management", "name": "Quality Procedure", From 984fdde692331a3bd7f0c1e5eb7f06df149f3551 Mon Sep 17 00:00:00 2001 From: Anupam Date: Mon, 12 Oct 2020 18:06:58 +0530 Subject: [PATCH 2/2] fix: review fixes --- .../doctype/quality_procedure/quality_procedure.json | 5 +++-- .../doctype/quality_procedure/quality_procedure.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json index 1dc4660c44d..32a1ebcc0ca 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_rename": 1, "autoname": "format:PRC-{quality_procedure_name}", "creation": "2018-10-06 00:06:29.756804", @@ -17,7 +18,6 @@ ], "fields": [ { - "depends_on": "eval: doc.is_group == 0", "fieldname": "parent_quality_procedure", "fieldtype": "Link", "label": "Parent Procedure", @@ -71,7 +71,8 @@ } ], "is_tree": 1, - "modified": "2020-09-22 12:56:50.700777", + "links": [], + "modified": "2020-10-12 16:14:11.167537", "modified_by": "Administrator", "module": "Quality Management", "name": "Quality Procedure", diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py index 1952e578673..797c26b64c2 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe -from frappe.utils.nestedset import NestedSet +from frappe.utils.nestedset import NestedSet, rebuild_tree from frappe import _ class QualityProcedure(NestedSet): @@ -42,6 +42,8 @@ class QualityProcedure(NestedSet): doc.save(ignore_permissions=True) def set_parent(self): + rebuild_tree('Quality Procedure', 'parent_quality_procedure') + for process in self.processes: # Set parent for only those children who don't have a parent parent_quality_procedure = frappe.db.get_value("Quality Procedure", process.procedure, "parent_quality_procedure")