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
=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py 2013-04-24 09:28:10 +0000
+++ hr_timesheet/hr_timesheet.py 2013-08-26 13:38:36 +0000
@@ -170,7 +170,7 @@
170 if ids:170 if ids:
171 new_date = self.read(cr, uid, ids[0], ['date'])['date']171 new_date = self.read(cr, uid, ids[0], ['date'])['date']
172 if date != new_date:172 if date != new_date:
173 warning = {'title':'User Alert!','message':'Changing the date will let this entry appear in the timesheet of the new date.'}173 warning = {'title':_('User Alert!'),'message':_('Changing the date will let this entry appear in the timesheet of the new date.')}
174 return {'value':{},'warning':warning}174 return {'value':{},'warning':warning}
175 return {'value':{}}175 return {'value':{}}
176176
177177
=== modified file 'hr_timesheet/i18n/hr_timesheet.pot'
--- hr_timesheet/i18n/hr_timesheet.pot 2013-06-07 19:43:09 +0000
+++ hr_timesheet/i18n/hr_timesheet.pot 2013-08-26 13:38:36 +0000
@@ -185,6 +185,7 @@
185msgid "Warning!"185msgid "Warning!"
186msgstr ""186msgstr ""
187187
188
188#. module: hr_timesheet189#. module: hr_timesheet
189#: field:hr.analytic.timesheet,partner_id:0190#: field:hr.analytic.timesheet,partner_id:0
190msgid "Partner"191msgid "Partner"