From f8122646ba5a1b7a741aa749bd63d061d7d531a8 Mon Sep 17 00:00:00 2001 From: Maxwell Morais Date: Mon, 18 Apr 2016 13:24:25 -0300 Subject: [PATCH] Set `get_contact_details` and `get_address_display` to the right standard! --- erpnext/crm/doctype/opportunity/opportunity.js | 4 +++- .../maintenance_schedule/maintenance_schedule.js | 10 ++++++---- .../doctype/maintenance_visit/maintenance_visit.js | 12 +++++++----- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js index a918cf3257..9bf11df9b5 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.js +++ b/erpnext/crm/doctype/opportunity/opportunity.js @@ -8,7 +8,9 @@ frappe.ui.form.on("Opportunity", { customer: function(frm) { erpnext.utils.get_party_details(frm); }, - customer_address: erpnext.utils.get_address_display, + customer_address: function(frm, cdt, cdn){ + erpnext.utils.get_address_display(frm, 'customer_address', 'address_display', false); + }, contact_person: erpnext.utils.get_contact_details, enquiry_from: function(frm) { frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead"); diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js index 650429c8d9..b1cd3e2bfc 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -5,10 +5,12 @@ frappe.provide("erpnext.support"); frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) { erpnext.utils.get_party_details(frm) }); -frappe.ui.form.on_change("Maintenance Schedule", "customer_address", - erpnext.utils.get_address_display); -frappe.ui.form.on_change("Maintenance Schedule", "contact_person", - erpnext.utils.get_contact_details); +frappe.ui.form.on_change("Maintenance Schedule", "customer_address", function(){ + erpnext.utils.get_address_display(cur_frm, 'customer_address', 'address_display'); +}); +frappe.ui.form.on_change("Maintenance Schedule", "contact_person", function(){ + erpnext.utils.get_contact_details(cur_frm); +}); // TODO commonify this code erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({ diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js index 65a84c0903..c748bae095 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js @@ -6,10 +6,12 @@ frappe.require("assets/erpnext/js/utils.js"); frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) { erpnext.utils.get_party_details(frm) }); -frappe.ui.form.on_change("Maintenance Visit", "customer_address", - erpnext.utils.get_address_display); -frappe.ui.form.on_change("Maintenance Visit", "contact_person", - erpnext.utils.get_contact_details); +frappe.ui.form.on_change("Maintenance Visit", "customer_address", function(frm){ + erpnext.utils.get_address_display(frm, 'customer_address', 'address_display') +}); +frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){ + erpnext.utils.get_contact_details(frm) +}); // TODO commonify this code erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({ @@ -87,4 +89,4 @@ cur_frm.fields_dict['purposes'].grid.get_field('item_code').get_query = function cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) { return {query: "erpnext.controllers.queries.customer_query" } -} \ No newline at end of file +}