nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 10:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into latest

Browse Source 
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
This commit is contained in:
Anand Doshi
2012-01-25 17:21:14 +05:30
parent 6be842f960 46848a48fe
commit 6e174cc2c4
12 changed files with 73 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/setup/doctype/notification_control/notification_control.js
View File

@@ -6,26 +6,26 @@ cur_frm.cscript.select_transaction = function(doc, dt, dn) {
refresh_field('custom_message');
}
$c_obj('Notification Control','get_message',doc.select_transaction, callback)
}
}
}
cur_frm.cscript.notify = function(doc, args) {
if(validate_email(args['send_to'] || doc.contact_email || '')) {
$c_obj('Notification Control', 'get_formatted_message', {
type: args['type'],
doctype: args['doctype'],
contact_name: args['contact_name'] || doc.contact_display
}, function(r, rt) {
if(!r.exc) {
var res = JSON.parse(r.message);
var send_from = (function() {
if(user!='Administrator') {
return user;
} else {
return (wn.control_panel.auto_email_id || 'automail@erpnext.com');
}
})();
if(res.send) {
$c_obj('Notification Control', 'get_formatted_message', {
type: args['type'],
doctype: args['doctype'],
contact_name: args['contact_name'] || doc.contact_display
}, function(r, rt) {
if(!r.exc) {
var res = JSON.parse(r.message);
var send_from = (function() {
if(user!='Administrator') {
return user;
} else {
return (wn.control_panel.auto_email_id || 'automail@erpnext.com');
}
})();
if(res.send) {
if(validate_email(args['send_to'] || doc.contact_email || '')) {
var print_heading = (doc.select_print_heading || args['type'])
sendmail(
args['send_to'] || doc.contact_email,
@@ -37,9 +37,11 @@ cur_frm.cscript.notify = function(doc, args) {
);
msgprint('This ' + print_heading + ' is being sent to <b>'
+ (args['send_to'] || doc.contact_email) + '</b><br />...');
} else {
msgprint('Invalid/Missing Email Address. ' + print_heading + ' not sent.');
}
}
//console.log(JSON.parse(r.message));
});
}
}
//console.log(JSON.parse(r.message));
});
}