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

[Ravish(OpenERP)]

Hello,

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

Thanks Lot.

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

=== 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 @@
         if ids:
             new_date = self.read(cr, uid, ids[0], ['date'])['date']
             if date != new_date:
-                warning = {'title':'User Alert!','message':'Changing the date will let this entry appear in the timesheet of the new date.'}
+                warning = {'title':_('User Alert!'),'message':_('Changing the date will let this entry appear in the timesheet of the new date.')}
                 return {'value':{},'warning':warning}
         return {'value':{}}
 
 
=== 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 @@
 msgid "Warning!"
 msgstr ""
 
+
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"