From 7c072af98f74530d0bdb047646127fc713022dde Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 16:12:58 +0530
Subject: [PATCH 1/4] [IMP]

bzr revid: apa@tinyerp.com-20120329104258-hrc0jn0ysuafzigl
---
 addons/project/project_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 2ee0bac76ab..535766fade0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -215,15 +215,14 @@
                                 </table>
                                 <table border="0" width="350px">
                                     <tr>
-                                        <td align="left" width="120px" valign="middle">
+                                        <td align="left" width="120px" valign="bottom">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
-                                            
                                         </td>
-                                        <td align="right" valign="middle" width="130px">
+                                        <td align="right" valign="bottom" width="130px" height="20px">
                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
                                             </t>

From 829ec0a2d02dde8ce3b00f9564936a9b2ed83d85 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 16:25:52 +0530
Subject: [PATCH 2/4] [IMP]

bzr revid: apa@tinyerp.com-20120329105552-yf4edx77rzlleonn
---
 addons/project/static/src/css/project.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 9d674163a7c..62b97beadb2 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -74,5 +74,5 @@
 }
 
 div.oe_fold_column{
-  padding:2px !important;
+  padding:0px !important;
 }
\ No newline at end of file

From 2f042dc4330c86e6546c7c6f2b8250788d287573 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 16:53:07 +0530
Subject: [PATCH 3/4] [IMP]

bzr revid: apa@tinyerp.com-20120329112307-muo085udc4dh3oi5
---
 addons/project/static/src/css/project.css         | 10 ++++++++++
 addons/project_timesheet/project_timesheet.py     |  4 ++--
 .../project_timesheet/project_timesheet_view.xml  | 15 +++++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

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>

From 9aa3b59b2f1d0f471cfd27b6ca6e91c77b4e1881 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 17:49:31 +0530
Subject: [PATCH 4/4] [IMP]

bzr revid: apa@tinyerp.com-20120329121931-w3e4bclwmuhhzsg2
---
 addons/project/project_view.xml                     | 12 +++++++-----
 addons/project/static/src/css/project.css           |  6 ++++--
 addons/project_timesheet/project_timesheet_view.xml |  7 +++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 535766fade0..b27e9dcbd1d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,6 +186,10 @@
                                         <td width="60px" align="center" valign="top">
                                             <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
                                             <div class="manager"><field name="user_id"/></div>
+                                            <t t-if="record.date.raw_value">
+                                                <kbd class="user">Deadline</kbd>
+                                                <div class="manager"><field name="date"/></div>
+                                            </t>
                                         </td>
                                         <td align="left" valign="middle" width="220px">
                                             <div class="oe_project_border">
@@ -204,12 +208,10 @@
                                             </div>
                                         </td>
                                         <td width="70px" valign="top" align="right">
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><field name="date"/></div>
+                                                <div id="sequence">
+                                                    <!--<kbd class="user">Deadline</kbd>-->
+                                                    <!--<div class="manager"><field name="date"/></div>-->
                                                 </div>
-                                            </t>
                                         </td>
                                     </tr>
                                 </table>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 28bc351df28..7e5869d80fe 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,7 +1,8 @@
 .oe_to_invoice_buttons {
-    min-height: 30px;
+    min-height: 60px;
     min-width: 50px;
-    vertical-align: baseline;
+    vertical-align: top;
+  
 }
 
 .oe_to_invoice_buttons:hover {
@@ -26,6 +27,7 @@
   
 }
 .sequence {
+  padding-bottom: 4px !important;
   border-bottom: groove;
   /*font-size: 20px;*/
   text-align: center;
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c396935610f..c945223cd10 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -44,14 +44,13 @@
                         <button name="open_timesheets" class="oe_project_buttons" type="object" tooltip="timesheets"><img src="/project_timesheet/static/src/img/timesheet_icon.png" class="project_icon"/></button>
                     </t>
                 </xpath>
-                <xpath expr="//div[@class='sequence']" position="after">
+                <xpath expr="//div[@id='sequence']" position="inside">
 		    
                     <div class="sequence">
 			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
-			    <!--<kbd class="to_invoice">To invoice</kbd>-->
+			    <small>To invoice</small>
 			    <div class="manager">
-				<code>To invoice</code>
-				<strong><field name="amount_invoiced"/></strong>
+				<field name="amount_invoiced"/>
 			    </div>
 			</button>
 		    </div>