From 57774c032cb1eca874e96c82574e29cdafb56a4b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 28 Nov 2012 16:01:58 +0530 Subject: [PATCH] contact.js: set customer, supplier --- buying/doctype/supplier/supplier.js | 7 +++++++ selling/doctype/customer/customer.js | 10 ++++++++++ setup/doctype/sales_partner/sales_partner.js | 7 ++++++- utilities/doctype/contact/contact.js | 17 ----------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js index e3f591c731..4fd94f562d 100644 --- a/buying/doctype/supplier/supplier.js +++ b/buying/doctype/supplier/supplier.js @@ -75,6 +75,13 @@ cur_frm.cscript.make_contact = function() { parent: cur_frm.fields_dict['contact_html'].wrapper, page_length: 2, new_doctype: "Contact", + custom_new_doc: function(doctype) { + var contact = LocalDB.create('Contact'); + contact = locals['Contact'][contact]; + contact.supplier = cur_frm.doc.name; + contact.supplier_name = cur_frm.doc.supplier_name; + wn.set_route("Form", "Contact", contact.name); + }, get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, diff --git a/selling/doctype/customer/customer.js b/selling/doctype/customer/customer.js index 028ad6e09b..2031fe8b7b 100644 --- a/selling/doctype/customer/customer.js +++ b/selling/doctype/customer/customer.js @@ -93,6 +93,16 @@ cur_frm.cscript.make_contact = function() { cur_frm.contact_list = new wn.ui.Listing({ parent: cur_frm.fields_dict['contact_html'].wrapper, page_length: 2, + custom_new_doc: function(doctype) { + var contact = LocalDB.create('Contact'); + contact = locals['Contact'][contact]; + contact.customer = cur_frm.doc.name; + contact.customer_name = cur_frm.doc.customer_name; + if(cur_frm.doc.customer_type == 'Individual') { + contact.first_name = cur_frm.doc.customer_name; + } + wn.set_route("Form", "Contact", contact.name); + }, new_doctype: "Contact", get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" diff --git a/setup/doctype/sales_partner/sales_partner.js b/setup/doctype/sales_partner/sales_partner.js index caf16dca10..f5c084da38 100644 --- a/setup/doctype/sales_partner/sales_partner.js +++ b/setup/doctype/sales_partner/sales_partner.js @@ -76,6 +76,12 @@ cur_frm.cscript.make_contact = function() { parent: cur_frm.fields_dict['contact_html'].wrapper, page_length: 2, new_doctype: "Contact", + custom_new_doc: function(doctype) { + var contact = LocalDB.create('Contact'); + contact = locals['Contact'][contact]; + contact.sales_partner = cur_frm.doc.name; + wn.set_route("Form", "Contact", contact.name); + }, get_query: function() { return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc" }, @@ -92,7 +98,6 @@ cur_frm.cscript.make_contact = function() { }); } cur_frm.contact_list.run(); - } cur_frm.fields_dict['partner_target_details'].grid.get_field("item_group").get_query = function(doc, dt, dn) { diff --git a/utilities/doctype/contact/contact.js b/utilities/doctype/contact/contact.js index 0a33e08620..d51c0f5887 100644 --- a/utilities/doctype/contact/contact.js +++ b/utilities/doctype/contact/contact.js @@ -23,23 +23,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.fields_dict.customer.get_query = erpnext.utils.customer_query; cur_frm.fields_dict.supplier.get_query = erpnext.utils.supplier_query; - - var route = wn.get_route(); - if(route[1]=='Supplier') { - var supplier = wn.container.page.frm.doc; - doc.supplier = supplier.name; - doc.supplier_name = supplier.supplier_name; - } else if(route[1]=='Customer') { - var customer = wn.container.page.frm.doc; - doc.customer = customer.name; - doc.customer_name = customer.customer_name; - if(customer.customer_type == 'Individual') { - doc.first_name = customer.customer_name; - } - } else if(route[1]=='Sales Partner') { - var sp = wn.container.page.frm.doc; - doc.sales_partner = sp.name; - } } cur_frm.cscript.refresh = function() {