From da2e47979e0b477285603798c5b9a40ce8e42699 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 16:32:14 +0530
Subject: [PATCH] [IMP]

bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh
---
 addons/project/project_view.xml               | 20 ++++++++++++-------
 addons/project/static/src/css/project.css     |  1 +
 .../project_timesheet_view.xml                | 12 +++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bdd593f424b..84045b2992b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,9 +188,15 @@
                                                 <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>
+                                            <t t-if="record.date.raw_value">
+                                                <div class="sequence">
+                                                    <kbd class="user">Deadline</kbd>
+                                                    <div class="manager"><b><field name="date"/></b></div>
+                                                </div>
+                                            </t>
                                           </td>
                                         <td class="td_name">
-                                            <div class="oe_project_border">
+                                            <div>
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
                                                 </h4>
@@ -213,12 +219,12 @@
                                             </div>
                                         </td>
                                         <td class="td_deadline">
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><b><field name="date"/></b></div>
-                                                </div>
-                                            </t>
+                                            <!--<t t-if="record.date.raw_value">-->
+                                            <!--    <div class="sequence">-->
+                                            <!--        <kbd class="user">Deadline</kbd>-->
+                                            <!--        <div class="manager"><b><field name="date"/></b></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 d6ff6ef8695..9aa559bfb13 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -36,6 +36,7 @@
   text-align: center;
 }
 
+
 .project_icon{
     width: 30px;
     display: block;
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index fa59e2ee5e1..19e0316715c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -46,20 +46,18 @@
                         <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[@class='td_image']" position="inside">
-		    <div class="sequence">
-			<kbd class="user">Remaining Hours</kbd>
-			<div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
-		    </div>
-                </xpath>
 		<xpath expr="//td[@class='td_deadline']" position="inside">
 		    <div class="sequence">
 			<kbd class="user">To invoice</kbd>
 			<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" context="{'invoice':1}">Invoice</button>
+			<kbd class="user">Remaining Hours</kbd>
+			<div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
 		    </div>
+		<!--    <div class="sequence">-->
+		<!--	<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>-->
+		<!--    </div>-->
 		</xpath>
             </field>
         </record>