Merge lp:~camptocamp/openobject-addons/7.0-fix-1188593 into lp:openobject-addons/7.0

[Nicolas Bessi - Camptocamp]

fix bug 1188593
timesheet sheet name_search now supports monthly and daily timesheet range

[lp:~camptocamp/openobject-addons/7.0-fix-1188593]

9206. By Nicolas Bessi - Camptocamp on 2013-06-17

[MRG] fix of hr_timesheet_sheet translation management name_get

Unmerged revisions

9206. By Nicolas Bessi - Camptocamp on 2013-06-17

[MRG] fix of hr_timesheet_sheet translation management name_get

9205. By Nicolas Bessi - Camptocamp on 2013-06-07

[FIX] bug 1188593 name_search now support monthly and daily timesheet range

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-08 08:59:38 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-17 12:38:29 +0000
@@ -198,13 +198,23 @@
         return True
 
     def name_get(self, cr, uid, ids, context=None):
+        user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        tm_range = user.company_id.timesheet_range or 'month'
+        if tm_range == 'week':
+            tformat = _('Week %U')
+        elif tm_range == 'month':
+            tformat = _('Month %m')
+        elif tm_range == 'day':
+            tformat = user.lang.date_format if user.lang.date_format else '%Y-%m-%d'
+        else:
+            raise ValueError(_('Unsupported timesheet range: %s') % tm_range)
         if not ids:
             return []
         if isinstance(ids, (long, int)):
             ids = [ids]
-        return [(r['id'], _('Week ')+datetime.strptime(r['date_from'], '%Y-%m-%d').strftime('%U')) \
+        return [(r['id'], datetime.strptime(r['date_from'], '%Y-%m-%d').strftime(tformat))
                 for r in self.read(cr, uid, ids, ['date_from'],
-                    context=context, load='_classic_write')]
+                                   context=context, load='_classic_write')]
 
     def unlink(self, cr, uid, ids, context=None):
         sheets = self.read(cr, uid, ids, ['state','total_attendance'], context=context)
@@ -555,4 +565,3 @@
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-