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

Merge pull request #23398 from anupamvs/quality-procedure-v13

Browse Source 
fix: quality procedure parent
This commit is contained in:
rohitwaghchaure 2020-10-15 15:52:22 +05:30 committed by GitHub
commit 79c1c4e3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,5 +10,13 @@ frappe.ui.form.on('Quality Procedure', {
}
};
});
frm.set_query('parent_quality_procedure', function(){
return {
filters: {
is_group: 1
}
};
});
}
});

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

@ -21,8 +21,7 @@
"fieldname": "parent_quality_procedure",
"fieldtype": "Link",
"label": "Parent Procedure",
"options": "Quality Procedure",
"read_only": 1
"options": "Quality Procedure"
},
{
"default": "0",
@ -73,7 +72,7 @@
],
"is_tree": 1,
"links": [],
"modified": "2020-06-17 17:25:03.434953",
"modified": "2020-10-13 11:46:07.744194",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality Procedure",

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

@ -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")