From 4457f2618a7337c0996d53a4406d7a70b04a3b98 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 18:12:01 +0530
Subject: [ADD]:added new module analytic_contract_project.

bzr revid: apa@tinyerp.com-20120607124201-bjmupfhjfecr8h90
---
 .../analytic_contract_project_view.xml             | 95 ++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 addons/analytic_contract_project/analytic_contract_project_view.xml

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
new file mode 100644
index 00000000000..d4d8c9e221d
--- /dev/null
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="project_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">project.project.form.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//page[@name="team"]' position='before'>
+                    <page string="Contract Data">
+						<group col="4" colspan="4">
+							<group colspan="2" col= "2" class="oe_form_group_label_border">
+								<separator colspan="2" string="Validity"/>
+								<field name="date_start"/>
+								<field name="date"/>
+								<group col="6" colspan="2" class="oe_form_group_label_border">
+									<field name="quantity_max"/>
+									<field name="company_uom_id" nolabel="1" readonly="1"/>
+									<field name="remaining_hours" string="/ Remaining"/>
+								</group>
+							</group>
+							<group colspan="2" col= "2" class="oe_form_group_label_border">
+								<separator colspan="2" string="Invoice Rate"/>
+								<field name="manager_id" />
+								<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+								<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+							</group>
+						</group>
+						<separator colspan="4" string="Invoicing"/>
+						<group col="1" colspan="4">
+							<table border="0">
+								<tr>
+									<th class="oe_th_160px" height="20px"></th>
+									<th width="10px"></th>
+									<th class="oe_th_110px">Est.Tot</th>
+									<th class="oe_th_110px">Invoiced</th>
+									<th class="oe_th_110px">Remaining</th>
+									<th class="oe_th_110px">Ready To Invoice</th>
+									<th width="10px"></th>
+									<th></th>
+									<th></th>
+								</tr>
+								<tr>
+								<th class="oe_border_right">Fix Price Invoices</th>
+									<td><field name="fix_price_invoices" nolabel="1"/></td>
+									<td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td width="10px"></td>
+									<td><button class= "oe_btn_width" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+								</tr>
+								<tr>
+									<th class="oe_border_right">Invoice On Timesheets</th>
+									<td><field name="invoice_on_timesheets" nolabel="1"/></td>
+									<td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td width="10px"></td>
+									<td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+								</tr>
+<!--								<tr>
+									<th class="oe_border_right">Charge Expenses</th>
+									<td><field name="charge_expenses" nolabel="1"/></td>
+									<td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+									<td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+									<td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+									<td width="10px"></td>
+									<td><button class= "oe_btn_width" name="account_analytic_analysis.open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+									<td><button class= "oe_btn_width" name="account_analytic_analysis.hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
+								</tr>-->
+								<tr>
+									<th class="oe_border_right">Total</th>
+									<td width="10px"></td>
+									<td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+									<td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+									<td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+									<td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+								</tr>
+							</table>
+						</group>
+						<separator string="Terms and Conditions" colspan="4" name="description"/>
+						<field colspan="4" name="description" nolabel="1"/>
+					</page>
+				</xpath>
+			</field>
+        </record>
+    </data>
+</openerp>
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 .../analytic_contract_project_view.xml               | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index d4d8c9e221d..cea5957347d 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -50,8 +50,8 @@
 									<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 									<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 									<td width="10px"></td>
-									<td><button class= "oe_btn_width" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td><button icon="terp-check" class= "oe_btn_width" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+									<td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
 								</tr>
 								<tr>
 									<th class="oe_border_right">Invoice On Timesheets</th>
@@ -61,20 +61,10 @@
 									<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 									<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 									<td width="10px"></td>
-									<td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+									<td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
 								</tr>
-<!--								<tr>
-									<th class="oe_border_right">Charge Expenses</th>
-									<td><field name="charge_expenses" nolabel="1"/></td>
-									<td><field class="oe_th_110px" name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-									<td class="oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-									<td width="10px"></td>
-									<td><button class= "oe_btn_width" name="account_analytic_analysis.open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-									<td><button class= "oe_btn_width" name="account_analytic_analysis.hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-								</tr>-->
+								<div name="end_of_tabl_hook"/>
 								<tr>
 									<th class="oe_border_right">Total</th>
 									<td width="10px"></td>
-- 
cgit v1.2.3


From 56ffb32517c4041ddc46b4762aac83687c3591c2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 14 Jun 2012 15:37:53 +0530
Subject: [IMP]:contract,analytic_project,analytic_hr_expense: improve whole
 contract view use group instead of table and improve view

bzr revid: sgo@tinyerp.com-20120614100753-giewe8jay1xx04wb
---
 .../analytic_contract_project_view.xml             | 92 +++++++++++-----------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index cea5957347d..06b5a66f107 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -29,52 +29,52 @@
 							</group>
 						</group>
 						<separator colspan="4" string="Invoicing"/>
-						<group col="1" colspan="4">
-							<table border="0">
-								<tr>
-									<th class="oe_th_160px" height="20px"></th>
-									<th width="10px"></th>
-									<th class="oe_th_110px">Est.Tot</th>
-									<th class="oe_th_110px">Invoiced</th>
-									<th class="oe_th_110px">Remaining</th>
-									<th class="oe_th_110px">Ready To Invoice</th>
-									<th width="10px"></th>
-									<th></th>
-									<th></th>
-								</tr>
-								<tr>
-								<th class="oe_border_right">Fix Price Invoices</th>
-									<td><field name="fix_price_invoices" nolabel="1"/></td>
-									<td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td width="10px"></td>
-									<td><button icon="terp-check" class= "oe_btn_width" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-									<td><button icon="terp-dolar_ok!" class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-								</tr>
-								<tr>
-									<th class="oe_border_right">Invoice On Timesheets</th>
-									<td><field name="invoice_on_timesheets" nolabel="1"/></td>
-									<td><field class="oe_th_110px" name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td width="10px"></td>
-									<td><button icon="terp-go-week" class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-									<td><button icon="terp-dolar" class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-								</tr>
-								<div name="end_of_tabl_hook"/>
-								<tr>
-									<th class="oe_border_right">Total</th>
-									<td width="10px"></td>
-									<td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-									<td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-									<td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-									<td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-								</tr>
-							</table>
-						</group>
+						<group colspan="4" col="6">
+                        <!-- header -->
+                        <div class="oe_field_label" colspan="2"/>
+                        <group colspan="4" col="6">
+                            <div class="oe_field_label_bold">Est.Tot</div>
+                            <div class="oe_field_label_bold">Invoiced</div>
+                            <div class="oe_field_label_bold">Remaining</div>
+                            <div class="oe_field_label_bold">To Invoice</div>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                        
+                        <!-- center -->
+                        
+                        <field class="oe_field_label" name="fix_price_invoices" />
+                        <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
+                            <field class="oe_float_field" name="amount_max" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
+                            <field class="oe_float_field" name="remaining_ca" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_to_invoice" nolabel="1"   />
+                            <div><button class="oe_btn_width_small" icon="terp-check" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar_ok!" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                        </group>
+                        
+                        <field class="oe_field_label" name="invoice_on_timesheets"/>
+                         <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                            <field class="oe_float_field" name="hours_qtt_est" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/>
+                            <field class="oe_float_field" name="remaining_hours" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" />
+                            <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
+                        </group>
+                        
+                        <!-- footer -->
+                        
+                        <div class="oe_field_label oe_border_right" style="max-width:200px;" colspan="2">Total  </div>
+                        <group colspan="4" col="6" >
+                            <field name="est_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="invoiced_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="remaining_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="toinvoice_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                      </group>
 						<separator string="Terms and Conditions" colspan="4" name="description"/>
 						<field colspan="4" name="description" nolabel="1"/>
 					</page>
-- 
cgit v1.2.3


From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:48:35 +0200
Subject: [IMP] project: version 7.0 for the project form view

bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
---
 .../analytic_contract_project_view.xml             | 167 ++++++++++++---------
 1 file changed, 97 insertions(+), 70 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index fff5e002f0f..7fe0e2abbbd 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -8,78 +8,105 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='before'>
+                <xpath expr='//page[@name="team"]' position='after'>
                     <page string="Contract Data">
-						<group col="4" colspan="4">
-							<group colspan="2" col= "2" class="oe_form_group_label_border">
-								<separator colspan="2" string="Validity"/>
-								<field name="date_start"/>
-								<field name="date"/>
-								<group col="6" colspan="2" class="oe_form_group_label_border">
-									<field name="quantity_max"/>
-									<field name="company_uom_id" nolabel="1" readonly="1"/>
-									<field name="remaining_hours" string="/ Remaining"/>
-								</group>
-							</group>
-							<group colspan="2" col= "2" class="oe_form_group_label_border">
-								<separator colspan="2" string="Invoice Rate"/>
-								<field name="manager_id" />
-								<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-								<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-							</group>
-						</group>
-						<separator colspan="4" string="Invoicing"/>
-						<group colspan="4" col="6">
-                        <!-- header -->
-                        <div class="oe_field_label" colspan="2"/>
-                        <group colspan="4" col="6">
-                            <div class="oe_field_label_bold">Est.Tot</div>
-                            <div class="oe_field_label_bold">Invoiced</div>
-                            <div class="oe_field_label_bold">Remaining</div>
-                            <div class="oe_field_label_bold">To Invoice</div>
-                            <div class="oe_btn_width_small"/>
-                            <div class="oe_btn_width"/>
+                        <group>
+                            <group string="Validity">
+                                <field name="date_start"/>
+                                <field name="date"/>
+                                <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"/>
+                                </div>
+                            </group>
+                            <group string="Invoice Options">
+                                <field name="manager_id" />
+                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
+                            </group>
                         </group>
-                        
-                        <!-- center -->
-                        
-                        <field class="oe_field_label" name="fix_price_invoices" />
-                        <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
-                            <field class="oe_float_field" name="amount_max" nolabel="1"   />
-                            <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
-                            <field class="oe_float_field" name="remaining_ca" nolabel="1"   />
-                            <field class="oe_float_field" name="ca_to_invoice" nolabel="1"   />
-                            <div><button class="oe_btn_width_small" icon="terp-check" name="%(account_analytic_analysis.action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
-                            <div><button class="oe_btn_width" icon="terp-dolar_ok!" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
-                        </group>
-                        
-                        <field class="oe_field_label" name="invoice_on_timesheets"/>
-                         <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                            <field class="oe_float_field" name="hours_qtt_est" nolabel="1" />
-                            <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/>
-                            <field class="oe_float_field" name="remaining_hours_to_invoice" nolabel="1" />
-                            <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" />
-                            <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div>
-                            <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
-                        </group>
-                        
-                        <!-- footer -->
-                        
-                        <div class="oe_field_label oe_border_right" style="max-width:200px;" colspan="2">Total  </div>
-                        <group colspan="4" col="6" >
-                            <field name="est_total" nolabel="1" class="oe_float_field oe_border_top"/>
-                            <field name="invoiced_total" nolabel="1" class="oe_float_field oe_border_top"/>
-                            <field name="remaining_total" nolabel="1" class="oe_float_field oe_border_top"/>
-                            <field name="toinvoice_total" nolabel="1" class="oe_float_field oe_border_top"/>
-                            <div class="oe_btn_width_small"/>
-                            <div class="oe_btn_width"/>
-                        </group>
-                      </group>
-						<separator string="Terms and Conditions" colspan="4" name="description"/>
-						<field colspan="4" name="description" nolabel="1"/>
-					</page>
-				</xpath>
-			</field>
+                    <separator name="toinvoice" string="Invoicing"/>
+                    <table width="100%%">
+                        <tr>
+                            <th></th>
+                            <th></th>
+                            <th><label string="Est.Tot"/></th>
+                            <th><label string="Invoiced"/></th>
+                            <th><label string="Remaining"/></th>
+                            <th><label string="To Invoice"/></th>
+                            <th></th>
+                        </tr><tr>
+                            <td>
+                                <label for="fix_price_invoices"/>
+                            </td><td>
+                                <field name="fix_price_invoices" class="oe_form_inline"/>
+                            </td><td>
+                                <field class="oe_form_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)]}"/>
+                            </td><td>
+                                <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td>
+                                <field class="oe_form_inline" name="ca_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]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
+                        </tr><tr nameattrs="{'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)]}"/>
+                            </td><td>
+                                <field class="oe_form_inline" name="hours_qtt_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)]}"/>
+                            </td><td>
+                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',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': active_id,'search_default_account_id': active_id}"/>
+                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td>
+                        </tr><tr>
+                            <th>
+                                <label string="Total"/>
+                            </th><td>
+                            </td><td>
+                                <field name="est_total" class="oe_form_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td>
+                                <field name="invoiced_total" class="oe_form_inline"/>
+                            </td><td>
+                                <field name="remaining_total" class="oe_form_inline"/>
+                            </td><td>
+                                <field name="toinvoice_total" class="oe_form_inline"/>
+                            </td><td>
+                            </td>
+                        </tr>
+                    </table>
+                    <separator string="Terms and Conditions" name="description"/>
+                    <field name="description"/>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_timesheets"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                    </tr>
+                </xpath>
+            </field>
         </record>
     </data>
 </openerp>
-- 
cgit v1.2.3


From 2f6e1c9dc82cd8820b03c7504420e828c9fb653d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 18 Jun 2012 19:03:33 +0200
Subject: [FIX] analytic_contract_project: fixed the destination of shortcut
 buttons in project form view

bzr revid: qdp-launchpad@openerp.com-20120618170333-xsml2de6dd18ozwg
---
 .../analytic_contract_project_view.xml                        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 7fe0e2abbbd..5f4988996c2 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="project_account_analytic_account_form" model="ir.ui.view">
             <field name="name">project.project.form.inherit</field>
             <field name="model">project.project</field>
@@ -52,8 +53,8 @@
                             </td><td>
                                 <field class="oe_form_inline" name="ca_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]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></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)]}">
                             <td>
                                 <label for="invoice_on_timesheets"/>
@@ -68,10 +69,10 @@
                             </td><td>
                                 <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',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': active_id,'search_default_account_id': active_id}"/>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <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)]}"/>
                             </td>
-                        </tr><tr>
+                        </tr><tr name="total">
                             <th>
                                 <label string="Total"/>
                             </th><td>
-- 
cgit v1.2.3


From 66d32bb0b94782c44e86d8d1697882ea6a9be646 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 18 Jun 2012 19:08:00 +0200
Subject: [FIX] analytic_contract_project: fixed billing table in project form
 view

bzr revid: qdp-launchpad@openerp.com-20120618170800-lbevbtxrvhcfgrb3
---
 addons/analytic_contract_project/analytic_contract_project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 5f4988996c2..8060978b562 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -51,7 +51,7 @@
                             </td><td>
                                 <field class="oe_form_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                <field class="oe_form_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>
@@ -63,11 +63,11 @@
                             </td><td>
                                 <field class="oe_form_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_form_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)]}"/>
                             </td><td>
-                                <field class="oe_form_inline" name="hours_qtt_non_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                                <field class="oe_form_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)]}"/>
-- 
cgit v1.2.3


From 015f03776e03384cfa6fe477ef51ef26896a4178 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 19 Jun 2012 14:21:28 +0200
Subject: [IMP] contract management: improved usability, mostly in
 account.analytic.account form view

bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98
---
 .../analytic_contract_project_view.xml                      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 8060978b562..fc6263c5fea 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -109,5 +109,18 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="contract_inherited_form" model="ir.ui.view">
+            <field name="name">Inherit contract form : adding UoM</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <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"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
-- 
cgit v1.2.3


From 266dbe297231d6b1bf1de9449bfdb3a5f116170d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 26 Jun 2012 13:02:35 +0200
Subject: [IMP] contract management: oe_form_inline -> oe_inline

bzr revid: qdp-launchpad@openerp.com-20120626110235-et4y4m25k8u3fex4
---
 .../analytic_contract_project_view.xml             | 44 +++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'addons/analytic_contract_project/analytic_contract_project_view.xml')

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>
-- 
cgit v1.2.3