Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs into lp:openobject-server/6.1

  1. 6.1-fix_tools.email_send-chs
  2. Merge into 6.1
Proposed by Christophe Simonis (OpenERP)
Status: Merged
Merged at revision: 4090
Proposed branch: lp:~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs
Merge into: lp:openobject-server/6.1
Diff against target: 42 lines (+3/-4)
2 files modified
openerp/addons/base/ir/ir_mail_server.py (+1/-2)
openerp/tools/misc.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Approve
Review via email: mp+96191@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Woops, thanks for spotting!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
2--- openerp/addons/base/ir/ir_mail_server.py 2012-01-24 11:47:30 +0000
3+++ openerp/addons/base/ir/ir_mail_server.py 2012-03-06 17:36:39 +0000
4@@ -2,7 +2,7 @@
5 ##############################################################################
6 #
7 # OpenERP, Open Source Management Solution
8-# Copyright (C) 2011 OpenERP S.A (<http://www.openerp.com>)
9+# Copyright (C) 2011-2012 OpenERP S.A (<http://www.openerp.com>)
10 #
11 # This program is free software: you can redistribute it and/or modify
12 # it under the terms of the GNU Affero General Public License as
13@@ -364,7 +364,6 @@
14 :param smtp_user: optional SMTP user, if mail_server_id is not passed
15 :param smtp_password: optional SMTP password to use, if mail_server_id is not passed
16 :param smtp_debug: optional SMTP debug flag, if mail_server_id is not passed
17- :param debug: whether to turn on the SMTP level debugging, output to DEBUG log level
18 :return: the Message-ID of the message that was just sent, if successfully sent, otherwise raises
19 MailDeliveryException and logs root cause.
20 """
21
22=== modified file 'openerp/tools/misc.py'
23--- openerp/tools/misc.py 2012-02-08 17:28:25 +0000
24+++ openerp/tools/misc.py 2012-03-06 17:36:39 +0000
25@@ -3,7 +3,7 @@
26 #
27 # OpenERP, Open Source Management Solution
28 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
29-# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
30+# Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
31 #
32 # This program is free software: you can redistribute it and/or modify
33 # it under the terms of the GNU Affero General Public License as
34@@ -383,7 +383,7 @@
35
36 res = mail_server_pool.send_email(cr, uid or 1, email_msg, mail_server_id=None,
37 smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password,
38- smtp_encryption=('ssl' if ssl else None), debug=debug)
39+ smtp_encryption=('ssl' if ssl else None), smtp_debug=debug)
40 except Exception:
41 _logger.exception("tools.email_send failed to deliver email")
42 return False