Merge lp:~openerp-dev/openobject-addons/6.1-opw-578450-msh into lp:openobject-addons/6.1

Proposed by Mohammed Shekha(Open ERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6961
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-578450-msh
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
hr_timesheet/wizard/ (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-578450-msh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email:

Description of the change


Fixed the issue of translation, added missing underscore for action string.


To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Unmerged revisions

6961. By Mohammed Shekha(Open ERP)

[FIX]Fixed the issue of translation for the action string for wizard.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet/wizard/'
2--- hr_timesheet/wizard/ 2011-12-21 10:52:14 +0000
3+++ hr_timesheet/wizard/ 2012-08-29 05:40:38 +0000
4@@ -143,7 +143,7 @@
5 model_data_ids =,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_%s' % in_out)], context=context)
6 resource_id =, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
7 return {
8- 'name': 'Sign in / Sign out',
9+ 'name': _('Sign in / Sign out'),
10 'view_type': 'form',
11 'view_mode': 'tree,form',
12 'res_model': 'hr.sign.%s.project' % in_out,