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

[Fix] Default letter head

Browse Source
This commit is contained in:
Rohit Waghchaure
2016-04-11 12:10:20 +05:30
parent 3912a31a6f
commit b2e7a1f605
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ erpnext.utils.get_address_display = function(frm, address_field, display_field,
if(r.message) {
frm.set_value(display_field, r.message)
}
if(frappe.meta.get_docfield(frm.doc.doctype, "taxes") && !is_your_company_address) {
if(!erpnext.utils.validate_mandatory(frm, "Customer/Supplier",
frm.doc.customer || frm.doc.supplier, address_field)) return;
@@ -99,7 +99,7 @@ erpnext.utils.get_address_display = function(frm, address_field, display_field,
} else {
frm.set_value(display_field, null);
}
}
erpnext.utils.get_contact_details = function(frm) {
@@ -127,7 +127,7 @@ erpnext.utils.validate_mandatory = function(frm, label, value, trigger_on) {
return true;
}
erpnext.utils.get_shipping_address = function(frm){
erpnext.utils.get_shipping_address = function(frm, callback){
frappe.call({
method: "erpnext.utilities.doctype.address.address.get_shipping_address",
args: {company: frm.doc.company},
@@ -136,6 +136,10 @@ erpnext.utils.get_shipping_address = function(frm){
frm.set_value("shipping_address", r.message[0]) //Address title or name
frm.set_value("shipping_address_display", r.message[1]) //Address to be displayed on the page
}
if(callback){
return callback();
}
}
});
}