Merge lp:~openerp-dev/openobject-addons/trunk-bug-1098238-vba into lp:openobject-addons

[Vijaykumar Baladaniya (OpenERP)]

Hello Sir,

    All changes applied related to bug: [https://bugs.launchpad.net/openobject-addons/+bug/1098238].
    Kindly review the code.

Thanks,
 vba

Unmerged revisions

8508. By Vijaykumar Baladaniya (OpenERP) on 2013-01-18

[FIX] Improve search parameter.

=== modified file 'hr_timesheet_sheet/wizard/hr_timesheet_current.py'
--- hr_timesheet_sheet/wizard/hr_timesheet_current.py	2012-12-06 14:56:32 +0000
+++ hr_timesheet_sheet/wizard/hr_timesheet_current.py	2013-01-18 06:00:34 +0000
@@ -36,7 +36,7 @@
         user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
         if not len(user_ids):
             raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
-        ids = ts.search(cr, uid, [('user_id','=',uid),('state','in',('draft','new')),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
+        ids = ts.search(cr, uid, [('user_id','=',uid),('state','in',('draft','new','confirm')),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
 
         if len(ids) > 1:
             view_type = 'tree,form'