openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

Jigar Amin - OpenERP has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #707906 Creating partner from the thunderbird with non-english characters fail
  https://bugs.launchpad.net/bugs/707906
  #710723 report task complete with email customer generate fatal error (With Mail Header )
  https://bugs.launchpad.net/bugs/710723

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/48461

Hello,
   Changes with the Merge Proposal:
    + BUF Fix > lp:710723 
   Kindly Review this.
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/48461
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.

=== modified file 'project/wizard/project_task_close.py'
--- project/wizard/project_task_close.py	2011-01-14 00:11:01 +0000
+++ project/wizard/project_task_close.py	2011-02-03 12:26:21 +0000
@@ -22,7 +22,7 @@
 from osv import fields, osv
 import tools
 from tools.translate import _
-
+import re
 class project_task_close(osv.osv_memory):
     """
     Close Task
@@ -99,8 +99,14 @@
                 }
 
                 to_adr = []
-                header = (project.warn_header or '') % val
-                footer = (project.warn_footer or '') % val
+                header = footer = ''
+                try:
+                    header_str = (project.warn_header or '')
+                    footer_str = (project.warn_footer or '')
+                    header = (re.sub(r'\%\W*\(', '%(', header_str)) % val
+                    footer = (re.sub(r'\%\W*\(', '%(', footer_str)) % val
+                except:
+                    raise osv.except_osv(_('Error'), _("Invlaid automatic variables used in project header or foooter."))
                 body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature)
                 if data.manager_warn and data.manager_email:
                     to_adr.append(data.manager_email)