From 355f15b4560cd431bd617b53a7d20adfb1a61e01 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 30 Mar 2012 11:24:19 +0530
Subject: [PATCH 1/2] [IMP]

bzr revid: sgo@tinyerp.com-20120330055419-0h6vm6szysfn3fez
---
 addons/project_timesheet/project_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index ff64e08c5e1..2780f71271f 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_account_id':project.id,
+                'search_default_account_id':project.analytic_account_id.id,
                 #'search_default_open':1,
             })
             value = {

From c39ec15984770913feefa7f17b81c8e0ac5b13d5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 30 Mar 2012 14:10:59 +0530
Subject: [PATCH 2/2] [IMP]

bzr revid: sgo@tinyerp.com-20120330084059-d0vfd8s1c4sw0got
---
 addons/project_timesheet/project_timesheet.py       | 6 +++++-
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 2780f71271f..e9e53b1a131 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -30,7 +30,7 @@ class project_project(osv.osv):
     _inherit = 'project.project'
 
     _columns = {
-        'timesheets' : fields.boolean('Timesheets',help = "If you check this field timesheets appears in kanban view")
+        'timesheets' : fields.boolean('Timesheets',help = "If you check this field timesheets appears in kanban view"),
     }
     _defaults = {
         'timesheets' : True,
@@ -56,6 +56,10 @@ class project_project(osv.osv):
             context = {}
         value = {}
         data_obj = self.pool.get('ir.model.data')
+        if context.get('btn'):
+            context.update({
+                'search_default_to_invoice':1,
+            })
         for project in self.browse(cr, uid, ids, context=context):
             # Get Timesheet views
             tree_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_tree_inherit_account_id')
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 11863c6507c..3801b0dce81 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -58,7 +58,7 @@
 			<div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
 		    </div>
 		    <div class="sequence">
-			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">Invoice</button>
+			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'btn':'invoice'}">Invoice</button>
 		    </div>
 		</xpath>
             </field>