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

[Yann Papouin]

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Thanks for all the 6.1 bugfixing work! I insist in translate all possible unresolved bugs also to 7.0.

Regards.

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Yann,

looks like this patch disables all variable substitution:

    >>> '%(name)s' % {'name': 'bla'}
    'bla'
    >>> '%(name)s'.replace('%', '%%') % {'name': 'bla'}
    '%(name)s'

Not sure about the validity of this bug. You could view it as a usability issue that the templates need to be configured to contain the double % where a literal % needs to be displayed. Having this 'fixed' on the technical level would misform existing templates that already contain the double %. At this time in the 6.1 lifecycle, I would much rather simply have an additional comment on the action rule view that hints at the need for the double % to display a literal %. So would you please consider changing the view instead of the code?

review: Needs Fixing

[Yann Papouin (yann-papouin)]

Indeed, my "fix" totally breaks this part.

The problem initially comes from a custom module I made to replace by safe_eval all values in double brackets.
One of the value return a name with a percent inside.

review: Disapprove

=== 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