nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1993 from anandpdoshi/anand-july-28

Browse Source 
[minor] Fixed address listing
This commit is contained in:
Anand Doshi
2014-07-28 14:21:29 +05:30
parent f8b318aef1 9c018fe984
commit 9ea4154b81
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/supplier/supplier.js
View File

@@ -70,7 +70,7 @@ cur_frm.cscript.make_address = function() {
new_doctype: "Address", new_doctype: "Address",
get_query: function() { get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where supplier='" + return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where supplier='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_address desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_address desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No addresses created'), no_results_message: __('No addresses created'),
@@ -89,7 +89,7 @@ cur_frm.cscript.make_contact = function() {
new_doctype: "Contact", new_doctype: "Contact",
get_query: function() { get_query: function() {
return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='" + return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_contact desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_contact desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No contacts created'), no_results_message: __('No contacts created'),

4
erpnext/selling/doctype/customer/customer.js
View File

@@ -87,7 +87,7 @@ cur_frm.cscript.make_address = function() {
new_doctype: "Address", new_doctype: "Address",
get_query: function() { get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where customer='" + return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where customer='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_address desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_address desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No addresses created'), no_results_message: __('No addresses created'),
@@ -106,7 +106,7 @@ cur_frm.cscript.make_contact = function() {
new_doctype: "Contact", new_doctype: "Contact",
get_query: function() { get_query: function() {
return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='" + return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_contact desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_contact desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No contacts created'), no_results_message: __('No contacts created'),

4
erpnext/setup/doctype/sales_partner/sales_partner.js
View File

@@ -42,7 +42,7 @@ cur_frm.cscript.make_address = function() {
}, },
get_query: function() { get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='" + return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_address desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_address desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No addresses created'), no_results_message: __('No addresses created'),
@@ -66,7 +66,7 @@ cur_frm.cscript.make_contact = function() {
}, },
get_query: function() { 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='" + return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where sales_partner='" +
cur_frm.doc.name.replace("'", "\\'") + "' and docstatus != 2 order by is_primary_contact desc" cur_frm.doc.name.replace(/'/g, "\\'") + "' and docstatus != 2 order by is_primary_contact desc"
}, },
as_dict: 1, as_dict: 1,
no_results_message: __('No contacts created'), no_results_message: __('No contacts created'),