diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css index f504a0f4f10..36ea9a34db9 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css @@ -1,5 +1,8 @@ @charset "utf-8"; -.openerp .oe_form_readonly .oe_timesheet_button_add { +.openerp .oe_form_readonly .oe_timesheet_weekly .oe_timesheet_button_add { + display: none; +} +.openerp .oe_form_readonly .oe_timesheet_weekly div.oe_view_nocontent { display: none; } .openerp .oe_timesheet_weekly { diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass index 9c986517508..5e04271037c 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass @@ -2,8 +2,11 @@ .openerp .oe_form_readonly - .oe_timesheet_button_add - display: none + .oe_timesheet_weekly + .oe_timesheet_button_add + display: none + div.oe_view_nocontent + display: none .oe_timesheet_weekly overflow-x: auto table diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml index f75342c958e..667c7af23be 100644 --- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml +++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml @@ -51,6 +51,18 @@ +
+
+

+ Click to add a project you worked on. +

+ You will be able to register your working hours and + activities on these projects. You can also click on a + selected project/analytic account to setup the + invoicing options. +

+
+
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py index 2af8792472e..652d5139288 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py @@ -36,7 +36,7 @@ class hr_timesheet_current_open(osv.osv_memory): 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','=','draft'),('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')),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context) if len(ids) > 1: view_type = 'tree,form'