pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 840c3be7b5

Browse Source
This commit is contained in:
Christophe Simonis
2018-02-15 12:56:01 +01:00
parent 9a67c8b946 840c3be7b5
commit 251b2fdc54
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/models/mail_channel.py
+1 -1
View File
@@ -197,7 +197,7 @@ class Channel(models.Model):
# http://blogs.technet.com/b/exchange/archive/2006/10/06/3395024.aspx # http://blogs.technet.com/b/exchange/archive/2006/10/06/3395024.aspx
headers['X-Auto-Response-Suppress'] = 'OOF' headers['X-Auto-Response-Suppress'] = 'OOF'
if self.alias_domain and self.alias_name: 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) headers['List-Post'] = '<mailto:%s@%s>' % (self.alias_name, self.alias_domain)
# Avoid users thinking it was a personal message # Avoid users thinking it was a personal message
# X-Forge-To: will replace To: after SMTP envelope is determined by ir.mail.server # X-Forge-To: will replace To: after SMTP envelope is determined by ir.mail.server
addons/point_of_sale/static/src/js/screens.js
+6 -1
View File
@@ -1228,9 +1228,14 @@ var ClientListScreenWidget = ScreenWidget.extend({
self.saved_client_details(partner_id); self.saved_client_details(partner_id);
},function(err,event){ },function(err,event){
event.preventDefault(); 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',{ self.gui.show_popup('error',{
'title': _t('Error: Could not Save Changes'), 'title': _t('Error: Could not Save Changes'),
'body': _t('Your Internet connection is probably down.'), 'body': error_body,
}); });
}); });
}, },