From 67255539f974d5d063f7addd85d875179b96c954 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 14:46:03 +0530
Subject: [PATCH 1/8] [IMP]

bzr revid: apa@tinyerp.com-20120330091603-c46u2zcdjiddpogq
---
 addons/project_timesheet/project_timesheet.py       | 11 +++--------
 addons/project_timesheet/project_timesheet_view.xml |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index e9e53b1a131..7fd6b9efb1b 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -56,19 +56,16 @@ 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,
-            })
+        to_invoice = False
+        if context.get('invoice'):to_invoice = context.get('invoice')
         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')
             form_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_form_inherit_account_id')
             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_to_invoice': to_invoice,
                 'search_default_account_id':project.analytic_account_id.id,
-                #'search_default_open':1,
             })
             value = {
                 'name': _('Bill Tasks Works'),
@@ -77,8 +74,6 @@ class project_project(osv.osv):
                 'view_mode': 'form,tree',
                 'res_model': 'account.analytic.line',
                 'view_id': False,
-            #    'domain':[('project_id','=', context.get('active_id',False))],
-                #'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 3801b0dce81..fa59e2ee5e1 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" context="{'btn':'invoice'}">Invoice</button>
+			<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>
 		    </div>
 		</xpath>
             </field>

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 2/8] [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>

From 45a71c9c35f0a93876215bff7e678652f483c32a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 16:44:40 +0530
Subject: [PATCH 3/8] [IMP]

bzr revid: apa@tinyerp.com-20120330111440-fcrsgemdp53e8ocs
---
 addons/project/project_view.xml               |  6 ++---
 .../project_timesheet_view.xml                | 27 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 84045b2992b..0e01df8848d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -198,7 +198,7 @@
                                         <td class="td_name">
                                             <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>
+                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
                                                 </h4>
                                                 <table >
                                                     <tr class ="task">
@@ -218,14 +218,14 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline">
+                                        <!--<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>-->
-                                        </td>
+                                        <!--</td>-->
                                     </tr>
                                 </table>
                                 <table class="project_table">
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 19e0316715c..20c5d67e081 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -41,20 +41,29 @@
                         </ul>
                    </t>
                 </xpath>
+		
+		<xpath expr="//h4[@class='oe_project_font1']" position="replace">
+		    <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>
+		</xpath>
+		
                 <xpath expr="//td[@class='buttons']" position="inside">
                     <t t-if="record.timesheets.raw_value">
                         <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_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">
-			<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 expr="//td[@class='td_name']" position="after">
+		    <td class="td_deadline">
+			<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">
+			    <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>
+		    </td>
 		<!--    <div class="sequence">-->
 		<!--	<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>-->
 		<!--    </div>-->

From 573342ec062cceb7c20dc78838907f90ea183351 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:17:23 +0530
Subject: [PATCH 4/8] [IMP]

bzr revid: apa@tinyerp.com-20120330114723-0jkanie1x1vn148y
---
 addons/project_issue/project_issue.py       | 2 +-
 addons/project_issue/project_issue_view.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 0c9b3079f25..2e426eb5f1e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -500,7 +500,7 @@ class project(osv.osv):
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'reply_to' : fields.char('Reply-To Email Address', size=256),
         'issues' : fields.boolean('Issues',help = "If you check this field issues are appears in kanban view"),
-        'total_issues': fields.function(_compute_issue , store=True,type='integer',string="Issue"),
+        'total_issues': fields.function(_compute_issue , type='integer',string="Issue"),
     }
     
     _defaults = {
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fa3a5ce9505..44a772b328b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -388,6 +388,7 @@
             <field name="arch" type="xml">
                 <field name="task" position="after">
                     <field name="issues"/>
+                    <field name="total_issues" invisible="1"/>
                 </field>
                 <xpath expr="//t[@t-name='tasks']" position="after">
                     <t t-name="issues">

From e7db374b457b7c0d6632d385c2b3db811208d6d0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:19:09 +0530
Subject: [PATCH 5/8] [IMP]

bzr revid: apa@tinyerp.com-20120330114909-3goa78ghbwtudsf1
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 20c5d67e081..d4ac405c4e8 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -60,7 +60,7 @@
 			    <div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
 			</div>
 			<div class="sequence">
-			    <kbd class="user">Remaining Hours</kbd>
+			    <kbd class="user">Rem. 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>
 		    </td>

From 53e1f2a4272a2f6db524ae4eaa54ea0c9da7325f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:34:11 +0530
Subject: [PATCH 6/8] [IMP]

bzr revid: apa@tinyerp.com-20120330120411-ddorwd83ocdb2qsw
---
 addons/project_timesheet/project_timesheet.py | 24 +++++++++----------
 .../project_timesheet_view.xml                |  7 +++---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 1783d871334..0a9cb910b45 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -29,23 +29,21 @@ from tools.translate import _
 class project_project(osv.osv):
     _inherit = 'project.project'
 
-    def _amt_to_invoiced(self, cr, uid, ids,field_name, arg, context=None):
+    def _amt_to_invoice(self, cr, uid, ids,field_name, arg, context=None):
         res = {}
-        task_pool=self.pool.get('project.task')
-        for id in ids:
-            task_ids = task_pool.search(cr, uid, [('project_id', '=', id)])
-            total = 0.0
-            project_record = self.browse(cr,uid,id)
-            acc_model = self.pool.get("account.analytic.line")
-            acc_id = acc_model.search(cr, uid, [('account_id', '=', project_record.analytic_account_id.id),('to_invoice', '=', 1),('invoice_id', '=', False)])
-            if acc_id:
-                for record in acc_model.browse(cr,uid,acc_id):
-                    total += record.amount
-            res[id]= total
+        aal_pool = self.pool.get("account.analytic.line")
+        for project in self.browse(cr,uid,ids,context=context):
+            line_ids = aal_pool.search(cr, uid, [('account_id','=',project.analytic_account_id.id),('to_invoice','=',1),('invoice_id','=',False)])
+            amt_to_invoice = 0.0
+            if line_ids:
+                for line in aal_pool.browse(cr,uid,line_ids,context=context):
+                    amt_to_invoice += line.amount
+            res[project.id] = (amt_to_invoice)*-1
         return res
+
     _columns = {
         'timesheets' : fields.boolean('Timesheets',help = "If you check this field timesheets appears in kanban view"),
-        'to_amt_invoice': fields.function(_amt_to_invoiced,string="Open Tasks")
+        'amt_to_invoice': fields.function(_amt_to_invoice,string="Amount to Invoice")
     }
     _defaults = {
         'timesheets' : True,
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 3be2a8437ac..a20400c6f2e 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             	<xpath expr="//field[@name='task']" position='after'>
 		    		<field name="timesheets"/>
-		    		<field name="to_amt_invoice" invisible="True"/>
+		    		<field name="amt_to_invoice" invisible="True"/>
                 </xpath>
             
                 <field name="warn_customer" position="after">
@@ -34,7 +34,7 @@
                     <field name="timesheets"/>
                     <field name="total_hours"/>
                     <field name="effective_hours"/>
-                    <field name="to_amt_invoice"/>
+                    <field name="amt_to_invoice"/>
                 </field>
 		<xpath expr="//t[@t-name='tasks']" position="after">
                     <t t-name="timesheets">
@@ -54,13 +54,12 @@
                     <t t-if="record.timesheets.raw_value">
                         <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>
-                    <t t-esc = "to_amt_invoice"/>
                 </xpath>
 		<xpath expr="//td[@class='td_name']" position="after">
 		    <td class="td_deadline">
 			<div class="sequence">
 			    <kbd class="user">To invoice</kbd>
-			    <div class="manager"><b><field name="to_amt_invoice"/> <field name="currency_id"/></b></div>
+			    <div class="manager"><b><field name="amt_to_invoice"/> <field name="currency_id"/></b></div>
 			</div>
 			<div class="sequence">
 			    <kbd class="user">Rem. Hours</kbd>

From 590e529d655dfa6662eb01e5923dec373d3433ed Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:39:41 +0530
Subject: [PATCH 7/8] [IMP]

bzr revid: apa@tinyerp.com-20120330120941-e7emkrpt6mzxyxu3
---
 addons/project/project_view.xml                     | 13 -------------
 addons/project_timesheet/project_timesheet.py       |  4 +---
 addons/project_timesheet/project_timesheet_view.xml |  7 +------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0e01df8848d..7fe0ee5f6dc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,14 +218,6 @@
                                                 </table>
                                             </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>-->
-                                        <!--</td>-->
                                     </tr>
                                 </table>
                                 <table class="project_table">
@@ -237,11 +229,6 @@
                                                 <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>-->
                                     </tr>
                                 </table>
                             </div>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 0a9cb910b45..fa64f266f1e 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -70,15 +70,13 @@ class project_project(osv.osv):
             context = {}
         value = {}
         data_obj = self.pool.get('ir.model.data')
-        to_invoice = False
-        if context.get('invoice'):to_invoice = context.get('invoice')
+
         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')
             form_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_form_inherit_account_id')
             search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
             context.update({
-                'search_default_to_invoice': to_invoice,
                 'search_default_account_id':project.analytic_account_id.id,
             })
             value = {
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index a20400c6f2e..51933f9ff7f 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -43,13 +43,11 @@
                         </ul>
                    </t>
                 </xpath>
-		
 		<xpath expr="//h4[@class='oe_project_font1']" position="replace">
 		    <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>
 		</xpath>
-		
                 <xpath expr="//td[@class='buttons']" position="inside">
                     <t t-if="record.timesheets.raw_value">
                         <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>
@@ -62,13 +60,10 @@
 			    <div class="manager"><b><field name="amt_to_invoice"/> <field name="currency_id"/></b></div>
 			</div>
 			<div class="sequence">
-			    <kbd class="user">Rem. Hours</kbd>
+			    <kbd class="user">Hr. to invoice</kbd>
 			    <div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
 			</div>
 		    </td>
-		<!--    <div class="sequence">-->
-		<!--	<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>-->
-		<!--    </div>-->
 		</xpath>
             </field>
         </record>

From c3651820db27125b038940311b4343e9e85ecf42 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:50:29 +0530
Subject: [PATCH 8/8] [IMP]

bzr revid: apa@tinyerp.com-20120330122029-gjnf3yz2za24n939
---
 addons/project_timesheet/project_timesheet_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 51933f9ff7f..7366b3a5493 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -56,11 +56,14 @@
 		<xpath expr="//td[@class='td_name']" position="after">
 		    <td class="td_deadline">
 			<div class="sequence">
-			    <kbd class="user">To invoice</kbd>
+			    <strong>To invoice</strong>
+			</div>
+			<div class="sequence">
+			    <kbd class="user">Amount</kbd>
 			    <div class="manager"><b><field name="amt_to_invoice"/> <field name="currency_id"/></b></div>
 			</div>
 			<div class="sequence">
-			    <kbd class="user">Hr. to invoice</kbd>
+			    <kbd class="user">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>
 		    </td>