From 299d0463e958ba35d9b11a59df42cf3d88b2126b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 19:03:04 +0530
Subject: [PATCH] [IMP]

bzr revid: apa@tinyerp.com-20120329133304-v225x3lbowhqyoad
---
 addons/project/project_view.xml                    |   27 +++++++++++++-------
 addons/project/static/src/css/project.css          |   17 +++++-------
 .../project_timesheet/project_timesheet_view.xml   |   21 ++++++++-------
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e3796d..9b3b310 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -184,8 +184,10 @@
                                 <table class="project_table">
                                     <tr>
                                         <td class="td_image">
-                                            <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])" class="avatar"/></button><br/>
-                                            <div class="manager"><field name="user_id"/></div>
+                                            <div class="sequence">
+                                                <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])" class="avatar"/></button><br/>
+                                                <div class="manager"><field name="user_id"/></div>
+                                            </div>
                                           </td>
                                         <td class="td_name">
                                             <div class="oe_project_border">
@@ -200,10 +202,17 @@
                                                             </t>
                                                         </td>
                                                     </tr>
+                                                    <tr>
+                                                        <td height="45px">
+                                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
+                                                            </t>
+                                                        </td>
+                                                    </tr>
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline" id="sequence">
+                                        <td class="td_deadline">
                                             <t t-if="record.date.raw_value">
                                                 <div class="sequence">
                                                     <kbd class="user">Deadline</kbd>
@@ -215,18 +224,18 @@
                                 </table>
                                 <table class="project_table">
                                     <tr>
-                                        <td class="td_hours">
+                                        <td class="td_hours" align="right">
                                             <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 class="td_member">
-                                            <t t-foreach="record.members.raw_value" t-as="member">
-                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
-                                            </t>
-                                        </td>
+                                        <!--<td class="td_member">-->
+                                        <!--    <t t-foreach="record.members.raw_value" t-as="member">-->
+                                        <!--        <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>-->
+                                        <!--    </t>-->
+                                        <!--</td>-->
                                     </tr>
                                 </table>
                             </div>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 54299ef..9657edf 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -17,9 +17,7 @@
 .oe_project_desc{
   width: 250px;
 }
-
 .progress{
-  text-align: left;
   width: auto;
 }
 .oe_project_font{
@@ -28,6 +26,7 @@
 }
 .sequence {
   padding-bottom: 4px !important;
+  padding-top: 3px !important;
   border-bottom: groove;
   /*font-size: 20px;*/
   text-align: center;
@@ -49,14 +48,12 @@
 }
 
 .project_table{
-    border:0;
-     width:350px;
+  width:350px;
 }
 .td_image{
-    width:60px;
-    text-align:center;
-    vertical-align:top;
-
+  width:60px;
+  text-align:center;
+  vertical-align:top;
 }
 .avatar{
     height:40px;
@@ -86,7 +83,7 @@
     width:20px;
 }
 .td_hours{
-    text-align:left;
+    text-align:right;
     vertical-align:bottom;
     width:120px
 }
@@ -95,7 +92,7 @@
     vertical-align:middle;
 }
 .invoiced{
-  font-size: 9px;
+  font-size: 10px;
 }
 .oe_project {
   width: 55px; 
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index d9ac00d..43868f6 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -46,21 +46,24 @@
                         <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="//td[@id='sequence']" position="inside">
+                <xpath expr="//td[@class='td_image']" position="inside">
 		    
-<!--                    <div class="sequence">-->
-<!--			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">-->
-<!--			    <small>To invoice</small>-->
-<!--			    <div class="manager">-->
-<!--				<field name="amount_invoiced"/>-->
-<!--			    </div>-->
-<!--			</button>-->
-<!--		    </div>-->
+
 			<div class="sequence">
 			    <kbd class="user">Hours</kbd>
 			    <div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</div>
 			</div>
                 </xpath>
+		<xpath expr="//td[@class='td_deadline']" position="inside">
+		    <div class="sequence">
+			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
+			    <small>To invoice</small>
+			    <div class="manager">
+				<field name="amount_invoiced"/>
+			    </div>
+			</button>
+		    </div>
+		</xpath>
             </field>
         </record>
 
-- 
1.7.10.4