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

[Nicolas Bessi - Camptocamp]

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

[Holger Brunn (Therp) (hbrunn)]

#11, #14 Put the strings themselves into _() and remove it from #26, this way they are properly extracted.

What I'd prefer: Put the whole string into a translated format string, like _('Week %U') and feed that to strftime (label can be dropped then). We shouldn't make assumptions on how other languages handle that.

review: Needs Fixing

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Thanks for review I just committed the fixes.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Stefan Rijnhart (Opener) (stefan-opener)]

LGMT

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-17 07:11:28 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-17 12:35:40 +0000
@@ -221,13 +221,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)
@@ -578,4 +588,3 @@
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-