From 9dbdef3bd559b4db6de03c58b8c0b7c2c2530152 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 8 Jun 2015 12:28:56 +0530 Subject: [PATCH 1/2] added code to fetch item name and desc on change of item code --- .../quality_inspection/quality_inspection.js | 15 +++++++++++++++ .../quality_inspection/quality_inspection.json | 10 +++++++++- .../quality_inspection/quality_inspection.py | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js index 3188c3c135..2e772c0b34 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.js @@ -57,3 +57,18 @@ cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) { return { filters: filter } } + +frappe.ui.form.on("Quality Inspection", "item_code", function(frm) { + frappe.call({ + method: 'erpnext.buying.doctype.quality_inspection.quality_inspection.get_item_details', + args: { + "item_code": frm.doc.item_code + }, + callback: function(r) { + if(!r.exc && r.message) { + frm.set_value("item_name", r.message.item_name); + frm.set_value("description", r.message.description); + } + } + }); +}) diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/buying/doctype/quality_inspection/quality_inspection.json index e1b57e4e08..875ce0dace 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json @@ -127,6 +127,14 @@ "permlevel": 0, "width": "50%" }, + { + "fieldname": "item_name", + "fieldtype": "Data", + "label": "Item Name", + "permlevel": 0, + "precision": "", + "read_only": 1 + }, { "fieldname": "description", "fieldtype": "Small Text", @@ -219,7 +227,7 @@ "icon": "icon-search", "idx": 1, "is_submittable": 1, - "modified": "2015-04-14 07:37:07.331291", + "modified": "2015-06-08 02:40:25.121948", "modified_by": "Administrator", "module": "Buying", "name": "Quality Inspection", diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/buying/doctype/quality_inspection/quality_inspection.py index ec32b6cc29..1b55c5b95c 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.py @@ -39,6 +39,10 @@ class QualityInspection(Document): where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""", (self.modified, self.purchase_receipt_no, self.item_code)) +@frappe.whitelist() +def get_item_details(item_code): + item_details = frappe.db.sql("select item_name, description from tabItem where item_code=%s", item_code, as_dict=1) + return item_details[0] if item_details else {} def item_query(doctype, txt, searchfield, start, page_len, filters): if filters.get("from"): From 42c1836db5527edbef348025284c479839d19884 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 8 Jun 2015 13:09:11 +0530 Subject: [PATCH 2/2] function changed to add fetch --- .../quality_inspection/quality_inspection.js | 17 +++-------------- .../quality_inspection/quality_inspection.py | 6 ------ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js index 2e772c0b34..1f7134dfcd 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.js @@ -58,17 +58,6 @@ cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) { return { filters: filter } } -frappe.ui.form.on("Quality Inspection", "item_code", function(frm) { - frappe.call({ - method: 'erpnext.buying.doctype.quality_inspection.quality_inspection.get_item_details', - args: { - "item_code": frm.doc.item_code - }, - callback: function(r) { - if(!r.exc && r.message) { - frm.set_value("item_name", r.message.item_name); - frm.set_value("description", r.message.description); - } - } - }); -}) +cur_frm.add_fetch('item_code', 'item_name', 'item_name'); +cur_frm.add_fetch('item_code', 'description', 'description'); + diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/buying/doctype/quality_inspection/quality_inspection.py index 1b55c5b95c..d1d9518bc2 100644 --- a/erpnext/buying/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.py @@ -31,7 +31,6 @@ class QualityInspection(Document): (self.name, self.modified, self.purchase_receipt_no, self.item_code)) - def on_cancel(self): if self.purchase_receipt_no: frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2 @@ -39,11 +38,6 @@ class QualityInspection(Document): where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""", (self.modified, self.purchase_receipt_no, self.item_code)) -@frappe.whitelist() -def get_item_details(item_code): - item_details = frappe.db.sql("select item_name, description from tabItem where item_code=%s", item_code, as_dict=1) - return item_details[0] if item_details else {} - def item_query(doctype, txt, searchfield, start, page_len, filters): if filters.get("from"): from frappe.desk.reportview import get_match_cond