diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2011-02-22 10:57:39 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2011-02-22 10:57:39 +0530 |
| commit | 2effe90a19ed94a652b3367bcb9d3e42ef0fcbbc (patch) | |
| tree | d606181554a75293638a8af4ef94b856367e4ec3 /addons/project/wizard | |
| parent | da05e220826b2c52ef1448454674d8e27b8e8b0b (diff) | |
| parent | 91c1768528c3ae07305bf5cf460b40bd1b9b6c00 (diff) | |
[MERGE] merged from trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110222052739-jjyzcrqv0pr29qwq
Diffstat (limited to 'addons/project/wizard')
| -rw-r--r-- | addons/project/wizard/project_task_close.py | 12 | ||||
| -rw-r--r-- | addons/project/wizard/project_task_delegate.py | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py index 0657888ccb4..589dd2df007 100644 --- a/addons/project/wizard/project_task_close.py +++ b/addons/project/wizard/project_task_close.py @@ -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 @@ -100,8 +100,14 @@ class project_task_close(osv.osv_memory): } 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) diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 72b32f7db68..99dfa3b4d5a 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -53,17 +53,17 @@ class project_task_delegate(osv.osv_memory): if 'name' in fields: if task_name.startswith(_('CHECK: ')): - newname = str(task_name).replace(_('CHECK: '), '') + newname = tools.ustr(task_name).replace(_('CHECK: '), '') else: - newname = task_name or '' + newname = tools.ustr(task_name or '') res.update({'name': newname}) if 'planned_hours' in fields: res.update({'planned_hours': task.remaining_hours or 0.0}) if 'prefix' in fields: if task_name.startswith(_('CHECK: ')): - newname = str(task_name).replace(_('CHECK: '), '') + newname = tools.ustr(task_name).replace(_('CHECK: '), '') else: - newname = task_name or '' + newname = tools.ustr(task_name or '') prefix = _('CHECK: ') + newname res.update({'prefix': prefix}) if 'new_task_description' in fields: |