diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-12 12:14:23 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-12 12:14:23 +0530 |
| commit | c25343dacbe7306124300a047bbe01d35731a9ec (patch) | |
| tree | eeb1b5bfb0a34a8c467086348342302833dfa21a /addons/crm/scripts | |
| parent | ff5c9032fc6645d3c30cd5cbfd91a0a0e8393db0 (diff) | |
| parent | bd933e119001332a6eea3255d490a62ccf7fb5fb (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100512064423-75gxtb5livda3429
Diffstat (limited to 'addons/crm/scripts')
| -rwxr-xr-x | addons/crm/scripts/openerp_mailgate/openerp_mailgate.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py index 607b0fbd434..5775319ee0a 100755 --- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py @@ -168,13 +168,14 @@ class email_parser(object): def _decode_header(self, s): from email.Header import decode_header - s = decode_header(s) + s = decode_header(s.replace('\r', '')) return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or [])) def msg_new(self, msg): message = self.msg_body_get(msg) msg_subject = self._decode_header(msg['Subject']) msg_from = self._decode_header(msg['From']) + msg_to = self._decode_header(msg['To']) msg_cc = self._decode_header(msg['Cc'] or '') data = { @@ -189,7 +190,7 @@ class email_parser(object): try: id = self.rpc(self.model, 'create', data) - self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'], False, False, {'model' : self.model}) + self.rpc(self.model, 'history', [id], 'Receive', True, msg_to, message['body'], msg_from, False, {'model' : self.model}) #self.rpc(self.model, 'case_open', [id]) except Exception, e: if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode: @@ -314,7 +315,7 @@ class email_parser(object): 'res_id': id } self.rpc('ir.attachment', 'create', data_attach) - self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body']) + self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), body['body']) return id def msg_send(self, msg, emails, priority=None): @@ -357,7 +358,7 @@ class email_parser(object): 'res_id': id } self.rpc('ir.attachment', 'create', data_attach) - self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body']) + self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), message['body']) return id def msg_test(self, msg, case_str): |