Merge lp:~openerp-dev/openobject-addons/7.0-opw-595318-rmu into lp:openobject-addons/7.0

Proposed by Ravish(OpenERP) on 2013-08-26
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-595318-rmu
Merge into: lp:openobject-addons/7.0
Diff against target: 24 lines (+2/-1)
2 files modified
hr_timesheet/hr_timesheet.py (+1/-1)
hr_timesheet/i18n/hr_timesheet.pot (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-595318-rmu
Reviewer Review Type Date Requested Status
Ravish(OpenERP) Pending
Naresh(OpenERP) 2013-08-26 Pending
Review via email: mp+182107@code.launchpad.net

Description of the change

Hello,

With this fix.. translation of message on change of date in time sheet activity is done.

Thanks Lot.

To post a comment you must log in.

Unmerged revisions

9301. By Ravish(OpenERP) on 2013-08-26

[IMP] improved the code

9300. By Ravish(OpenERP) on 2013-08-26

[FIx] improved the code as ask

9299. By Ravish(OpenERP) on 2013-07-17

[FIX] add translation for timesheet date_onchange

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet/hr_timesheet.py'
2--- hr_timesheet/hr_timesheet.py 2013-04-24 09:28:10 +0000
3+++ hr_timesheet/hr_timesheet.py 2013-08-26 13:38:36 +0000
4@@ -170,7 +170,7 @@
5 if ids:
6 new_date = self.read(cr, uid, ids[0], ['date'])['date']
7 if date != new_date:
8- warning = {'title':'User Alert!','message':'Changing the date will let this entry appear in the timesheet of the new date.'}
9+ warning = {'title':_('User Alert!'),'message':_('Changing the date will let this entry appear in the timesheet of the new date.')}
10 return {'value':{},'warning':warning}
11 return {'value':{}}
12
13
14=== modified file 'hr_timesheet/i18n/hr_timesheet.pot'
15--- hr_timesheet/i18n/hr_timesheet.pot 2013-06-07 19:43:09 +0000
16+++ hr_timesheet/i18n/hr_timesheet.pot 2013-08-26 13:38:36 +0000
17@@ -185,6 +185,7 @@
18 msgid "Warning!"
19 msgstr ""
20
21+
22 #. module: hr_timesheet
23 #: field:hr.analytic.timesheet,partner_id:0
24 msgid "Partner"