diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 62b97beadb2..28bc351df28 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,3 +1,13 @@
+.oe_to_invoice_buttons {
+    min-height: 30px;
+    min-width: 50px;
+    vertical-align: baseline;
+}
+
+.oe_to_invoice_buttons:hover {
+  cursor: pointer;
+}
+
 
 .oe_project_border{
   border-right: groove;
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index c7c43f98bdd..ff64e08c5e1 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -63,7 +63,7 @@ class project_project(osv.osv):
             search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
             context.update({
                 #'search_default_user_id': uid,
-                'search_default_project_id':project.id,
+                'search_default_account_id':project.id,
                 #'search_default_open':1,
             })
             value = {
@@ -74,7 +74,7 @@ class project_project(osv.osv):
                 'res_model': 'account.analytic.line',
                 'view_id': False,
             #    'domain':[('project_id','=', context.get('active_id',False))],
-                'context': context,
+                #'context': context,
                 'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
                 'type': 'ir.actions.act_window',
                 'search_view_id': search_view and search_view[1] or False,
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 7d58bddac9f..c396935610f 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -45,10 +45,17 @@
                     </t>
                 </xpath>
                 <xpath expr="//div[@class='sequence']" position="after">
-                	<div class="sequence">
-                   <kbd class="user">To invoice</kbd>
-                   <div class="manager"><field name="amount_invoiced"/></div>
-                   </div>
+		    
+                    <div class="sequence">
+			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
+			    <!--<kbd class="to_invoice">To invoice</kbd>-->
+			    <div class="manager">
+				<code>To invoice</code>
+				<strong><field name="amount_invoiced"/></strong>
+			    </div>
+			</button>
+		    </div>
+			
                 </xpath>
             </field>
         </record>