nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cleanup] move contact, address to frappe 💥

Browse Source
This commit is contained in:
Rushabh Mehta
2017-01-13 18:53:11 +05:30
parent 448acf6f46
commit b92087cb2d
52 changed files with 196 additions and 3168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
erpnext/public/js/queries.js
View File

@@ -36,17 +36,41 @@ $.extend(erpnext.queries, {
customer_filter: function(doc) {
if(!doc.customer) {
frappe.throw(__("Please specify a") + " " +
__(frappe.meta.get_label(doc.doctype, "customer", doc.name)));
frappe.throw(__("Please set {0}", __(frappe.meta.get_label(doc.doctype, "customer", doc.name))));
}
return { filters: { customer: doc.customer } };
},
contact_query: function(doc) {
if(frappe.contact_link) {
if(!doc[frappe.contact_link.fieldname]) {
frappe.throw(__("Please set {0}", __(frappe.meta.get_label(doc.doctype,
frappe.contact_link.fieldname, doc.name))));
}
return {
query: 'frappe.email.doctype.contact.contact.contact_query',
filters: { link_doctype: frappe.contact_link.doctype, link_name: doc[frappe.contact_link.fieldname] } };
}
},
address_query: function(doc) {
if(frappe.contact_link) {
if(!doc[frappe.contact_link.fieldname]) {
frappe.throw(__("Please set {0}", __(frappe.meta.get_label(doc.doctype,
frappe.contact_link.fieldname, doc.name))));
}
return {
query: 'frappe.email.doctype.address.address_query',
filters: { link_doctype: frappe.contact_link.doctype, link_name: doc[frappe.contact_link.fieldname] } };
}
},
supplier_filter: function(doc) {
if(!doc.supplier) {
frappe.throw(__("Please specify a") + " " +
__(frappe.meta.get_label(doc.doctype, "supplier", doc.name)));
frappe.throw(__("Please set {0}", __(frappe.meta.get_label(doc.doctype, "supplier", doc.name))));
}
return { filters: { supplier: doc.supplier } };
@@ -74,7 +98,7 @@ $.extend(erpnext.queries, {
filters: [
["Warehouse", "company", "in", ["", cstr(doc.company)]],
["Warehouse", "is_group", "=",0]
]
}
}

4
erpnext/public/js/utils/party.js
View File

@@ -65,7 +65,7 @@ erpnext.utils.get_address_display = function(frm, address_field, display_field,
if(!display_field) display_field = "address_display";
if(frm.doc[address_field]) {
frappe.call({
method: "erpnext.utilities.doctype.address.address.get_address_display",
method: "frappe.geo.doctype.address.address.get_address_display",
args: {"address_dict": frm.doc[address_field] },
callback: function(r) {
if(r.message) {
@@ -151,7 +151,7 @@ erpnext.utils.validate_mandatory = function(frm, label, value, trigger_on) {
erpnext.utils.get_shipping_address = function(frm, callback){
frappe.call({
method: "erpnext.utilities.doctype.address.address.get_shipping_address",
method: "frappe.geo.doctype.address.address.get_shipping_address",
args: {company: frm.doc.company},
callback: function(r){
if(r.message){