[IMP] hr_timesheet_invoice: improved view of wizard.

bzr revid: tpa@tinyerp.com-20120619120651-92939oil82r6w0k7

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index afc3a8b..0457fd9 100644 (file)
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -28,9 +28,8 @@
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
                 <header>
-                    <button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                    <button name="do_create" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
                 </header>
-                <group col="4" colspan="6">
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -38,7 +37,6 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
-                </group>
             </form>
             </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 c542c33..df840f9 100644 (file)
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -11,19 +11,17 @@
                 <header>
                     <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
                 </header>
-                <notebook>
-                    <page string="Billing Data">
-                       <group string="Do you want to show details of work in invoice?">
-                           <field name="date"/>
-                           <field name="time"/>
-                           <field name="name"/>
-                           <field name="price"/>
-                       </group>
-                       <group  string="Force to use a specific product">
-                           <field name="product"/>
-                       </group>
-                    </page>
-                </notebook>
+                <group>
+                       <group 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  string="Force to use a specific product" colspan="4">
+                           <field name="product"/>
+                       </group>
+                   </group>
             </form>
             </field>
         </record>