From c39b65a5f56926cada8daf2d41e4a40848909219 Mon Sep 17 00:00:00 2001 From: Anupam Date: Tue, 22 Sep 2020 14:23:54 +0530 Subject: [PATCH 1/2] fix: quality procedure parent --- .../doctype/quality_procedure/quality_procedure.js | 8 ++++++++ .../doctype/quality_procedure/quality_procedure.json | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js index cf2644e005..ac876229ec 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 b3c0d94890..b6be5d0f9b 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -18,11 +18,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", @@ -73,7 +73,7 @@ ], "is_tree": 1, "links": [], - "modified": "2020-06-17 17:25:03.434953", + "modified": "2020-09-22 14:22:49.874515", "modified_by": "Administrator", "module": "Quality Management", "name": "Quality Procedure", From 528a75ae9b6fd627ab9646617bfb93335a518b4c Mon Sep 17 00:00:00 2001 From: Anupam Date: Tue, 13 Oct 2020 11:46:52 +0530 Subject: [PATCH 2/2] fix: review changes --- .../doctype/quality_procedure/quality_procedure.json | 3 +-- .../doctype/quality_procedure/quality_procedure.py | 4 +++- 2 files changed, 4 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 b6be5d0f9b..1ed921cc76 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -18,7 +18,6 @@ ], "fields": [ { - "depends_on": "eval: doc.is_group == 0", "fieldname": "parent_quality_procedure", "fieldtype": "Link", "label": "Parent Procedure", @@ -73,7 +72,7 @@ ], "is_tree": 1, "links": [], - "modified": "2020-09-22 14:22:49.874515", + "modified": "2020-10-13 11:46:07.744194", "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 1952e57867..797c26b64c 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")