From 60db095a88197692bd07c8ea797eefc5346feb97 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 18:40:30 +0530
Subject: [PATCH] [IMP]

bzr revid: apa@tinyerp.com-20120329131030-vjfix4ygwcyrs90w
---
 addons/project/project_view.xml                    |   16 ++++++-------
 addons/project/static/src/css/project.css          |    3 +--
 .../project_timesheet/project_timesheet_view.xml   |   24 ++++++++++----------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 53ccca7..1e3796d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,11 +186,7 @@
                                         <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>
-                                            <t t-if="record.date.raw_value">
-                                                <kbd class="user">Deadline</kbd>
-                                                <div class="manager"><field name="date"/></div>
-                                            </t>
-                                        </td>
+                                          </td>
                                         <td class="td_name">
                                             <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
@@ -207,11 +203,13 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline">
-                                                <div id="sequence">
-                                                    <!--<kbd class="user">Deadline</kbd>-->
-                                                    <!--<div class="manager"><field name="date"/></div>-->
+                                        <td class="td_deadline" id="sequence">
+                                            <t t-if="record.date.raw_value">
+                                                <div class="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 1dc146d..54299ef 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -69,8 +69,7 @@
 }
 .td_deadline{
     width:70px;
-     vertical-align:top; 
-     text-align:right;
+    text-align:center;
 }
 .td_member{
     text-align:right;
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 14924c2..d9ac00d 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -46,20 +46,20 @@
                         <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[@id='sequence']" position="inside">
+                <xpath expr="//td[@id='sequence']" 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">-->
+<!--			<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)"/></div>
-                </div>
+			    <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>
             </field>
         </record>
-- 
1.7.10.4