Merge lp:~openerp-dev/openobject-addons/trunk-bug-1073246-Jaydeep into lp:openobject-addons

[Jaydeep Barot(OpenERP)]

To be change the header on the "My Current Timesheet" dialog is e.g. "October". Instead it is "Week 40" (first week of October).

Thanks,
Jaydeep Barot

[Jaydeep Barot(OpenERP) (jaydeep.barot-openerp)]

Hello,

I have Fixed in https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1073246-Jaydeep
Revision ID: <email address hidden>
revision no :- 8665

Thanks,
Jaydeep Barot.

Unmerged revisions

8665. By Jaydeep Barot(OpenERP) on 2013-04-09

[FIX] Change of employee My current timesheet header instead of week 40 to First week of October

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-21 12:23:59 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-14 05:37:46 +0000
@@ -26,6 +26,7 @@
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+_week=['First','Second','Third','Forth','Fifth']
 class hr_timesheet_sheet(osv.osv):
     _name = "hr_timesheet_sheet.sheet"
     _inherit = "mail.thread"
@@ -198,7 +199,10 @@
             return []
         if isinstance(ids, (long, int)):
             ids = [ids]
-        return [(r['id'], _('Week ')+datetime.strptime(r['date_from'], '%Y-%m-%d').strftime('%U')) \
+        for r in self.read(cr, uid, ids, ['date_from'], context=context):
+            day_of_month = datetime.strptime(r['date_from'],'%Y-%m-%d').strftime('%d')
+            week_number = ( int(day_of_month) - 1 ) // 7 + 1
+        return [(r['id'], _(_week[week_number-1] + ' Week Of ' )+datetime.strptime(r['date_from'], '%Y-%m-%d').strftime('%B')) \
                 for r in self.read(cr, uid, ids, ['date_from'],
                     context=context, load='_classic_write')]