[IMP] contract management: oe_form_inline -> oe_inline

bzr revid: qdp-launchpad@openerp.com-20120626110235-et4y4m25k8u3fex4

1 files changed, 23 insertions, 21 deletions

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index fc6263c5fea..0e61fe08d01 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -13,14 +13,16 @@
                     <page string="Contract Data">
                         <group>
                             <group string="Validity">
-                                <field name="date_start"/>
-                                <field name="date"/>
+                                <label for="date_start" string="Duration"/>
+                                <div name="duration">
+                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                </div>
                                 <label for="quantity_max"/>
                                 <div>
-                                    <field name="quantity_max" class="oe_form_inline"/>
-                                    <field name="company_uom_id" readonly="1" class="oe_form_inline"/> / Remaining: 
-                                    <field name="remaining_hours" class="oe_form_inline"/>
-                                    <field name="company_uom_id" readonly="1" class="oe_form_inline"/>
+                                    <field name="quantity_max" class="oe_inline"/>
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
+                                    <field name="remaining_hours" class="oe_inline"/> 
+                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
                                 </div>
                             </group>
                             <group string="Invoice Options">
@@ -43,31 +45,31 @@
                             <td>
                                 <label for="fix_price_invoices"/>
                             </td><td>
-                                <field name="fix_price_invoices" class="oe_form_inline"/>
+                                <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
-                                <field class="oe_form_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                                 <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
-                        </tr><tr nameattrs="{'invisible':[('use_timesheets','=',False)]}">
+                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
                             <td>
                                 <label for="invoice_on_timesheets"/>
                             </td><td>
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
                                 <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -77,13 +79,13 @@
                                 <label string="Total"/>
                             </th><td>
                             </td><td>
-                                <field name="est_total" class="oe_form_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field name="invoiced_total" class="oe_form_inline"/>
+                                <field name="invoiced_total" class="oe_inline"/>
                             </td><td>
-                                <field name="remaining_total" class="oe_form_inline"/>
+                                <field name="remaining_total" class="oe_inline"/>
                             </td><td>
-                                <field name="toinvoice_total" class="oe_form_inline"/>
+                                <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
@@ -118,7 +120,7 @@
             <field name="priority">50</field>
             <field name="arch" type="xml">
                 <xpath expr='//field[@name="remaining_hours"]' position='after'>
-                    <field name="company_uom_id" readonly="1" class="oe_form_inline"/>
+                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
                 </xpath>
             </field>
         </record>