nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5477 from neilLasrado/hotfix

Browse Source 
Set `get_contact_details` and `get_address_display` to the right stan…
This commit is contained in:
Anand Doshi
2016-06-16 18:41:48 +05:30
committed by GitHub
parent 8f6e6ff543 f8122646ba
commit 10ee3655d3
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/opportunity/opportunity.js
View File

@@ -8,7 +8,9 @@ frappe.ui.form.on("Opportunity", {
customer: function(frm) { customer: function(frm) {
erpnext.utils.get_party_details(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, contact_person: erpnext.utils.get_contact_details,
enquiry_from: function(frm) { enquiry_from: function(frm) {
frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead"); frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead");

10
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
View File

@@ -5,10 +5,12 @@ frappe.provide("erpnext.support");
frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) { frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) {
erpnext.utils.get_party_details(frm) }); erpnext.utils.get_party_details(frm) });
frappe.ui.form.on_change("Maintenance Schedule", "customer_address", frappe.ui.form.on_change("Maintenance Schedule", "customer_address", function(){
erpnext.utils.get_address_display); 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 // TODO commonify this code
erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({

12
erpnext/support/doctype/maintenance_visit/maintenance_visit.js
View File

@@ -6,10 +6,12 @@ frappe.require("assets/erpnext/js/utils.js");
frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) { frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) {
erpnext.utils.get_party_details(frm) }); erpnext.utils.get_party_details(frm) });
frappe.ui.form.on_change("Maintenance Visit", "customer_address", frappe.ui.form.on_change("Maintenance Visit", "customer_address", function(frm){
erpnext.utils.get_address_display); erpnext.utils.get_address_display(frm, 'customer_address', 'address_display')
frappe.ui.form.on_change("Maintenance Visit", "contact_person", });
erpnext.utils.get_contact_details); frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){
erpnext.utils.get_contact_details(frm)
});
// TODO commonify this code // TODO commonify this code
erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({ 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) { cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
return {query: "erpnext.controllers.queries.customer_query" } return {query: "erpnext.controllers.queries.customer_query" }
} }