From e8f95a2adf33913fd2b4feee912faf97023b264e Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 5 Aug 2019 14:21:09 +0530 Subject: [PATCH 1/4] fix: TreeView fixes --- .../doctype/quality_procedure/quality_procedure.json | 10 +++++----- .../doctype/quality_procedure/quality_procedure.py | 8 +++----- .../quality_procedure/quality_procedure_tree.js | 10 +++------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json index 7b241ef787..472b75103c 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -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", diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py index 52c3320840..4d3c522956 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py @@ -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: diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js index 15b7784dbd..8fd785f205 100644 --- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js +++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js @@ -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(); - } }; \ No newline at end of file From b9f2a6048be8f448c7d6ba792c80786c712aa295 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 7 Aug 2019 18:21:38 +0530 Subject: [PATCH 2/4] test: fix test cases --- .../doctype/quality_procedure/test_quality_procedure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py index 79f8771395..3289bb5a37 100644 --- a/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py +++ b/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py @@ -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" From 10e8073204ec2f4b2be32dcc89ef6000152af8cc Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 8 Aug 2019 18:19:24 +0530 Subject: [PATCH 3/4] fix: allow to subcotract service raw materials --- erpnext/controllers/buying_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 0b4d38ce5c..5c51a2c7bd 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -725,7 +725,7 @@ def get_items_from_bom(item_code, bom, exploded_item=1): where t2.parent = t1.name and t1.item = %s and t1.docstatus = 1 and t1.is_active = 1 and t1.name = %s - and t2.item_code = t3.name and t3.is_stock_item = 1""".format(doctype), + and t2.item_code = t3.name""".format(doctype), (item_code, bom), as_dict=1) if not bom_items: From 24c3b4e00ffab02eb47d7a22f4fda3da91bd94ff Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 9 Aug 2019 13:27:59 +0530 Subject: [PATCH 4/4] fix: get item from product bundle --- erpnext/public/js/controllers/buying.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index acc09ed213..118aee9a8c 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -452,7 +452,8 @@ erpnext.buying.get_items_from_product_bundle = function(frm) { company: frm.doc.company, is_subcontracted: frm.doc.is_subcontracted, transaction_date: frm.doc.transaction_date || frm.doc.posting_date, - ignore_pricing_rule: frm.doc.ignore_pricing_rule + ignore_pricing_rule: frm.doc.ignore_pricing_rule, + doctype: frm.doc.doctype } }, freeze: true,