From fc3b34ccc0f0ee1206d726cf1b1f538980870f07 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Oct 2010 18:55:46 +0530
Subject: [PATCH] [MOD] hr_timesheet_invoice : improvements

bzr revid: vir@tinyerp.com-20101012132546-c7sq4k1b0602o6w0
---
 .../hr_timesheet_invoice_view.xml              |  2 +-
 .../hr_timesheet_invoice_create_view.xml       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index a284523665c..4a70a80f381 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -80,7 +80,7 @@
             <field name="arch" type="xml">
                 <filter name="others" position="after">
                     <separator orientation="vertical"/>
-                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-sale"/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index c50e1b6974a..82276553edd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,13 +10,17 @@
             <form string="Invoice analytic lines">
                 <notebook colspan="4">
                     <page string="Billing Data">
-                        <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-                        <field name="date"/>
-                        <field name="time"/>
-                        <field name="name"/>
-                        <field name="price"/>
-                        <separator string="Force to use a specific product" colspan="4"/>
-                        <field name="product"/>
+	                   <group col="4" colspan="4">
+	                       <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+		                        <field name="date"/>
+		                        <field name="time"/>
+		                        <field name="name"/>
+		                        <field name="price"/>
+	                       </group>
+	                    <group col="2" colspan="4" groups="base.group_extended">
+	                        <separator string="Force to use a specific product" colspan="4" />
+	                        <field name="product"/>
+	                    </group>
                     </page>
                     <page string="Filter on Accounts" groups="base.group_extended">
                         <separator string="Choose accounts you want to invoice" colspan="4"/>