From 498cc58522e1f9f4202da4eb516d9dcf6ee3debd Mon Sep 17 00:00:00 2001 From: Maxwell Morais Date: Sun, 22 May 2016 20:19:30 -0300 Subject: [PATCH 1/3] get_address_display cannot be called directly The new function get_address_display dont allow directly call, since it dont support, `frm, cdt, cdn` as arguments --- .../doctype/maintenance_schedule/maintenance_schedule.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js index ab660466e6..98590dd6af 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -5,8 +5,9 @@ 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", "customer_address", function(){ + erpnext.utils.get_address_display(cur_frm, 'customer_address', 'address_display'); +}); frappe.ui.form.on_change("Maintenance Schedule", "contact_person", erpnext.utils.get_contact_details); From 57b6b1dc852f1b0923712a664588bcc434139bec Mon Sep 17 00:00:00 2001 From: Maxwell Morais Date: Tue, 7 Jun 2016 02:32:47 -0300 Subject: [PATCH 2/3] Set `get_contact_details` to the right standard! --- .../doctype/maintenance_schedule/maintenance_schedule.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js index 98590dd6af..7783b1b9f2 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js @@ -8,8 +8,9 @@ frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) { 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", - erpnext.utils.get_contact_details); +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({ From 1ea13f1f49c5087a5127c419eb2fc252f8e1d696 Mon Sep 17 00:00:00 2001 From: Maxwell Morais Date: Tue, 7 Jun 2016 02:35:11 -0300 Subject: [PATCH 3/3] Set `get_contact_details` and `get_address_display` to the right standard! --- .../doctype/maintenance_visit/maintenance_visit.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js index a267eb3ed0..f9d5e8dae5 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js @@ -6,10 +6,12 @@ frappe.provide("erpnext.support"); 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({ @@ -81,4 +83,4 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) { cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) { return {query: "erpnext.controllers.queries.customer_query" } -} \ No newline at end of file +}