Christophe (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs into lp:openobject-server/6.1.
Requested reviews: OpenERP Core Team (openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs/+merge/96191 -- https://code.launchpad.net/~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs/+merge/96191 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.1-fix_tools.email_send-chs.
=== modified file 'openerp/addons/base/ir/ir_mail_server.py' --- openerp/addons/base/ir/ir_mail_server.py 2012-01-24 11:47:30 +0000 +++ openerp/addons/base/ir/ir_mail_server.py 2012-03-06 17:36:39 +0000 @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2011 OpenERP S.A (<http://www.openerp.com>) +# Copyright (C) 2011-2012 OpenERP S.A (<http://www.openerp.com>) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -364,7 +364,6 @@ :param smtp_user: optional SMTP user, if mail_server_id is not passed :param smtp_password: optional SMTP password to use, if mail_server_id is not passed :param smtp_debug: optional SMTP debug flag, if mail_server_id is not passed - :param debug: whether to turn on the SMTP level debugging, output to DEBUG log level :return: the Message-ID of the message that was just sent, if successfully sent, otherwise raises MailDeliveryException and logs root cause. """ === modified file 'openerp/tools/misc.py' --- openerp/tools/misc.py 2012-02-08 17:28:25 +0000 +++ openerp/tools/misc.py 2012-03-06 17:36:39 +0000 @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). -# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>). +# Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -383,7 +383,7 @@ res = mail_server_pool.send_email(cr, uid or 1, email_msg, mail_server_id=None, smtp_server=smtp_server, smtp_port=smtp_port, smtp_user=smtp_user, smtp_password=smtp_password, - smtp_encryption=('ssl' if ssl else None), debug=debug) + smtp_encryption=('ssl' if ssl else None), smtp_debug=debug) except Exception: _logger.exception("tools.email_send failed to deliver email") return False
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
