← Back to branch summary

~openerp-community/openobject-server/fix-1130010-toxml-escape-quot

« back to all changes in this revision

Viewing changes to openerp/addons/base/ir/ir_mail_server.py

  • Committer: niv-openerp
  • Date: 2013-06-10 15:06:57 UTC
  • mfrom: (4867.1.15 saas-1)
  • Revision ID: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
[MERGE] saas1 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/addons/base/ir/ir_mail_server.py
31
31
import smtplib
32
32
import threading
33
33
 
 
34
from openerp import SUPERUSER_ID
34
35
from openerp.osv import osv, fields
35
36
from openerp.tools.translate import _
36
37
from openerp.tools import html2text
419
420
        # Get SMTP Server Details from Mail Server
420
421
        mail_server = None
421
422
        if mail_server_id:
422
 
            mail_server = self.browse(cr, uid, mail_server_id)
 
423
            mail_server = self.browse(cr, SUPERUSER_ID, mail_server_id)
423
424
        elif not smtp_server:
424
 
            mail_server_ids = self.search(cr, uid, [], order='sequence', limit=1)
 
425
            mail_server_ids = self.search(cr, SUPERUSER_ID, [], order='sequence', limit=1)
425
426
            if mail_server_ids:
426
 
                mail_server = self.browse(cr, uid, mail_server_ids[0])
 
427
                mail_server = self.browse(cr, SUPERUSER_ID, mail_server_ids[0])
427
428
 
428
429
        if mail_server:
429
430
            smtp_server = mail_server.smtp_host