[MERGE] forward port branch 9.0 up to 840c3be7b5
This commit is contained in:
@@ -197,7 +197,7 @@ class Channel(models.Model):
|
||||
# http://blogs.technet.com/b/exchange/archive/2006/10/06/3395024.aspx
|
||||
headers['X-Auto-Response-Suppress'] = 'OOF'
|
||||
if self.alias_domain and self.alias_name:
|
||||
headers['List-Id'] = '%s.%s' % (self.alias_name, self.alias_domain)
|
||||
headers['List-Id'] = '<%s.%s>' % (self.alias_name, self.alias_domain)
|
||||
headers['List-Post'] = '<mailto:%s@%s>' % (self.alias_name, self.alias_domain)
|
||||
# Avoid users thinking it was a personal message
|
||||
# X-Forge-To: will replace To: after SMTP envelope is determined by ir.mail.server
|
||||
|
||||
@@ -1228,9 +1228,14 @@ var ClientListScreenWidget = ScreenWidget.extend({
|
||||
self.saved_client_details(partner_id);
|
||||
},function(err,event){
|
||||
event.preventDefault();
|
||||
var error_body = _t('Your Internet connection is probably down.');
|
||||
if (err.data) {
|
||||
var except = err.data;
|
||||
error_body = except.arguments && except.arguments[0] || except.message || error_body;
|
||||
}
|
||||
self.gui.show_popup('error',{
|
||||
'title': _t('Error: Could not Save Changes'),
|
||||
'body': _t('Your Internet connection is probably down.'),
|
||||
'body': error_body,
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user