← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~yann-papouin/ocb-addons/6.1-bug-1276190-percentage-char-escape into lp:ocb-addons/6.1

 

Yann Papouin has proposed merging lp:~yann-papouin/ocb-addons/6.1-bug-1276190-percentage-char-escape into lp:ocb-addons/6.1.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1276190 in OpenERP Community Backports (Addons): "[6.1] format_mail raise an exception when % character exists in text"
  https://bugs.launchpad.net/ocb-addons/+bug/1276190

For more details, see:
https://code.launchpad.net/~yann-papouin/ocb-addons/6.1-bug-1276190-percentage-char-escape/+merge/204708
-- 
https://code.launchpad.net/~yann-papouin/ocb-addons/6.1-bug-1276190-percentage-char-escape/+merge/204708
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~yann-papouin/ocb-addons/6.1-bug-1276190-percentage-char-escape into lp:ocb-addons/6.1.
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2013-09-09 09:31:16 +0000
+++ base_action_rule/base_action_rule.py	2014-02-04 15:15:39 +0000
@@ -302,7 +302,7 @@
             'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
                                          obj.partner_address_id.email) or '/',
         }
-        return self.format_body(body % data)
+        return self.format_body(body.replace('%','%%') % data)
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
         """ send email


Follow ups