From e6164ad8e8d58bbf86d611e4ec92f6c16fb5ae7d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 19 Jun 2012 09:56:57 +0200
Subject: [PATCH 1/9] [IMP] modules kanban view: make icon non-clickable

bzr revid: rco@openerp.com-20120619075657-wahos7ymsnnp3fnr
---
 openerp/addons/base/module/module_view.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index d9d71cf880d..da345ea3fb6 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -69,8 +69,7 @@
             <field name="model">ir.module.module</field>
             <field name="type">kanban</field>
             <field name="arch" type="xml">
-
-              <kanban create="false">
+                <kanban create="false">
                   <field name="icon"/>
                   <field name="name"/>
                   <field name="state"/>
@@ -78,22 +77,19 @@
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette oe_kanban_auto_height">
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
-                        <a type="edit">
-                          <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
-                        </a>
+                        <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
                         <div class="oe_module_desc">
                           <h4><a type="edit"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <field name="name"/><br/>
                           </p>
-                          <button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
-                          <button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
+                          <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
+                          <button t-if="installed" disabled="disabled">Installed</button>
                         </div>
                       </div>
                     </t>
                   </templates>
-              </kanban>
-
+                </kanban>
             </field>
         </record>
 

From 204882916a07523d49ca7687a67a12144f910c07 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 19 Jun 2012 10:00:17 +0200
Subject: [PATCH 2/9] [IMP] modules view: rename title to 'Install a Module'

bzr revid: rco@openerp.com-20120619080017-4xw8vwx3sckzasni
---
 openerp/addons/base/module/module_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index da345ea3fb6..2fe4ff4a9df 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -191,7 +191,7 @@
             </field>
         </record>
         <record id="open_module_tree" model="ir.actions.act_window">
-            <field name="name">Modules</field>
+            <field name="name">Install a Module</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -199,7 +199,8 @@
             <field name="search_view_id" ref="view_module_filter"/>
             <field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
         </record>
-        <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management" sequence="1"/>
+        <menuitem id="menu_module_tree" parent="base.menu_management" name="Modules"
+            sequence="1" action="open_module_tree"/>
 
     </data>
 </openerp>

From f02c8858b34d9062517a2bb03d68926458b51862 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 19 Jun 2012 10:10:05 +0200
Subject: [PATCH 3/9] [IMP] translations: rename 'Load an Official Translation'
 to 'Load a Translation'

bzr revid: rco@openerp.com-20120619081005-uqx5e9add4k2ufvr
---
 .../base/module/wizard/base_language_install_view.xml  | 10 +++++-----
 openerp/addons/base/res/res_users.py                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index d7afd223303..0ebe9256a52 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -3,11 +3,11 @@
     <data>
 
         <record id="view_base_language_install" model="ir.ui.view">
-            <field name="name">Load Official Translation</field>
+            <field name="name">Load a Translation</field>
             <field name="model">base.language.install</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Load Official Translation">
+                <form string="Load a Translation">
                     <group colspan="4" col="8">
                         <group colspan="1">
                             <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -19,7 +19,7 @@
                         </group>
                         <separator orientation="vertical" colspan="1" rowspan="12"/>
                         <group colspan="6">
-                            <separator string="Load an Official Translation" colspan="4"/>
+                            <separator string="Load a Translation" colspan="4"/>
                             <group states="init" colspan="4">
                                 <field name="lang" colspan="4"/>
                                 <field name="overwrite" colspan="4" groups="base.group_no_one"/>
@@ -46,7 +46,7 @@ You must change the preferences of the user and open a new menu to view the chan
         </record>
 
         <record id="action_view_base_language_install" model="ir.actions.act_window">
-            <field name="name">Load Official Translation</field>
+            <field name="name">Load a Translation</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.language.install</field>
             <field name="view_type">form</field>
@@ -55,7 +55,7 @@ You must change the preferences of the user and open a new menu to view the chan
         </record>
 
         <menuitem
-        name="Load an Official Translation"
+        name="Load a Translation"
         action="action_view_base_language_install"
         id="menu_view_base_language_install"
         parent="menu_translation" sequence="2"/>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 8f424e534b0..e22b5addf48 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -226,7 +226,7 @@ class users(osv.osv):
 
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load an Official Translation' wizard available from the 'Administration' menu."),
+            help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."),
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
             help="The user's timezone, used to output proper date and time values inside printed reports. "
                  "It is important to set a value for this field. You should use the same timezone "

From 55e32e992b5352728ed3f9b1c099037ed49eda5d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 19 Jun 2012 10:37:32 +0200
Subject: [PATCH 4/9] [IMP] Settings: hide menus 'Companies', 'Users' and
 'OpenERP Enterprise' by restricting to group_no_one

bzr revid: rco@openerp.com-20120619083732-fet0psn4wksbujbx
---
 openerp/addons/base/base_menu.xml                              | 2 +-
 .../addons/base/publisher_warranty/publisher_warranty_view.xml | 3 ++-
 openerp/addons/base/res/res_company_view.xml                   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 8dddc0c60a3..abba27b7ed7 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -8,7 +8,7 @@
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
             <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
-            <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
+            <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4" groups="base.group_no_one"/>
             <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
                 <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
                 <menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 5130fa878f2..7820aeb6f62 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
+        <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"
+            groups="base.group_no_one"/>
 
         <record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
             <field name="name">publisher_warranty.contract.tree</field>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index e5e2480d4af..8c7c05d0451 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"/>
+        <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"
+            groups="base.group_no_one"/>
 
         <menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
 

From f2fba32b562e530cc54f48ea56145db15403af62 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 19 Jun 2012 10:56:18 +0200
Subject: [PATCH 5/9] [REF] Change the CSS classes

bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
---
 addons/account/account_invoice_view.xml       | 18 +++---
 addons/account/account_view.xml               |  8 +--
 addons/account/partner_view.xml               |  4 +-
 addons/account/project/project_view.xml       |  8 +--
 addons/account/res_config_view.xml            | 16 +++---
 .../account_payment/account_payment_view.xml  | 12 ++--
 .../voucher_payment_receipt_view.xml          |  8 +--
 .../voucher_sales_purchase_view.xml           | 16 +++---
 addons/base_calendar/base_calendar_view.xml   | 12 ++--
 addons/base_vat/base_vat_view.xml             |  6 +-
 addons/crm/crm_lead_view.xml                  | 30 +++++-----
 addons/crm/crm_meeting_view.xml               | 14 ++---
 addons/crm/crm_phonecall_view.xml             |  6 +-
 addons/crm_claim/crm_claim_view.xml           |  2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  2 +-
 addons/delivery/delivery_view.xml             |  8 +--
 addons/edi/static/src/xml/edi.xml             |  2 +-
 addons/event/event_view.xml                   | 12 ++--
 addons/google_map/static/src/js/google_map.js |  2 +-
 addons/hr/hr_view.xml                         | 10 ++--
 addons/hr_holidays/hr_holidays_view.xml       |  4 +-
 addons/hr_payroll/hr_payroll_view.xml         |  8 +--
 addons/hr_recruitment/hr_recruitment_view.xml | 16 +++---
 .../hr_timesheet_sheet_view.xml               |  4 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/mail/mail_message_view.xml             |  4 +-
 addons/mail/res_users_view.xml                |  2 +-
 .../marketing_campaign_view.xml               |  2 +-
 addons/mrp/mrp_view.xml                       | 22 ++++----
 addons/mrp_repair/mrp_repair_view.xml         |  6 +-
 addons/point_of_sale/point_of_sale_view.xml   |  2 +-
 addons/product/pricelist_view.xml             |  4 +-
 addons/product/product_view.xml               | 12 ++--
 addons/project/project_view.xml               |  8 +--
 addons/project_issue/project_issue_view.xml   |  4 +-
 .../project_long_term_view.xml                |  6 +-
 addons/purchase/purchase_view.xml             | 32 +++++------
 .../purchase_requisition_view.xml             |  6 +-
 addons/sale/sale_view.xml                     | 30 +++++-----
 addons/sale_margin/sale_margin_view.xml       |  2 +-
 addons/stock/product_view.xml                 |  4 +-
 addons/stock/stock_view.xml                   | 56 +++++++++----------
 addons/stock/wizard/stock_move_view.xml       |  8 +--
 addons/stock_planning/stock_planning_view.xml |  2 +-
 addons/survey/survey_view.xml                 |  2 +-
 45 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7dc6dce5b15..58a1abac364 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -56,8 +56,8 @@
                         <field name="name"/>
                         <label string="Quantity" for="quantity" align="1.0"/>
                         <div>
-                            <field name="quantity" class="oe_form_inline"/>
-                            <field name="uos_id" class="oe_form_inline"
+                            <field name="quantity" class="oe_inline"/>
+                            <field name="uos_id" class="oe_inline"
                               on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         </div>
                         <field name="price_unit"/>
@@ -218,10 +218,10 @@
                                     </field>
                                     <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </div>
-                                <group class="oe_form_subtotal_footer">
+                                <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
-                                    <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
                                     <field name="residual" style="margin-top: 10px"/>
                                     <field name="reconciled" invisible="1"/>
@@ -290,9 +290,9 @@
                         <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
                         <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
                         <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
-                        <field name="number" readonly="1" class="oe_form_inline"/>
+                        <field name="number" readonly="1" class="oe_inline"/>
                     </h1>
-                    <label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
+                    <label string="Concerns" for="name" class="oe_edit_only"/>
                     <h2>
                         <field name="name" placeholder="Project XYZ"/>
                     </h2>
@@ -321,7 +321,7 @@
 
                             <label for="currency_id"/>
                             <div>
-                                <field name="currency_id" class="oe_form_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
                                 <button name="%(action_account_change_currency)d" type="action"
                                   icon="terp-stock_effects-object-colorize"
                                   attrs="{'invisible':[('state','!=','draft')]}"
@@ -352,10 +352,10 @@
                                         type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
                                         help="This action will erase taxes"/>
                                 </div>
-                                <group class="oe_form_subtotal_footer">
+                                <group class="oe_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
-                                    <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                    <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
                                     <field name="residual" style="margin-top: 10px"/>
                                     <field name="reconciled" invisible="1"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f32630dd8ad..0f83d2f0ed3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -170,7 +170,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
+                    <label for="name" class="oe_edit_only" string="Account Name and Code:"/>
                     <h1>
                         <field name="name"/> - 
                         <field name="code"/>
@@ -465,10 +465,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
-                    <div class="oe_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="type" class="oe_form_readonly_hidden"/>
+                        <label for="type" class="oe_edit_only"/>
                         <h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2>
                     </div>
                     <notebook>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index cde16f0670f..b090b7e5609 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -104,8 +104,8 @@
                                         <div>
                                             <field name="street" placeholder="Street..."/>
                                             <div>
-                                                <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                                <field name="city" class="oe_form_inline" placeholder="City"/>
+                                                <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                                <field name="city" class="oe_inline" placeholder="City"/>
                                             </div>
                                             <field name="state_id" placeholder="State"/>
                                             <field name="country_id" placeholder="Country"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 3d6cace4ac5..e355c677e6d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -173,16 +173,16 @@
                             <field name="amount"/>
                             <label for="amount_currency"/>
                             <div>
-                                <field name="amount_currency" class="oe_form_inline"/>
-                                <field name="currency_id" class="oe_form_inline"/>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="Product Information">
                             <field name="product_id"/>
                             <label for="unit_amount"/>
                             <div>
-                                <field name="unit_amount" class="oe_form_inline"/>
-                                <field name="product_uom_id" class="oe_form_inline"/>
+                                <field name="unit_amount" class="oe_inline"/>
+                                <field name="product_uom_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="General Accounting">
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 24c7887bdfe..c0f00363585 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -75,14 +75,14 @@
                         <group string="Customer Invoices">
                             <label string="Invoice Sequence" for="sale_sequence_prefix"/>
                             <div>
-                                <field name="sale_sequence_prefix" class="oe_form_inline"/>
-                                <field name="sale_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                                <field name="sale_sequence_prefix" class="oe_inline"/>
+                                <field name="sale_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
                             </div>
 
                             <label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
                             <div>
-                                <field name="sale_refund_sequence_prefix" class="oe_form_inline"/>
-                                <field name="sale_refund_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                                <field name="sale_refund_sequence_prefix" class="oe_inline"/>
+                                <field name="sale_refund_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                             </div>
                             <field name="module_account_invoice_layout"/>
                             <field name="module_account_voucher"/>
@@ -92,13 +92,13 @@
                         <group string="Supplier Invoices">
                             <label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
                             <div>
-                                <field name="purchase_sequence_prefix" class="oe_form_inline"/>
-                                <field name="purchase_sequence_next" class="oe_form_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                                <field name="purchase_sequence_prefix" class="oe_inline"/>
+                                <field name="purchase_sequence_next" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
                             </div>
                             <label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
                             <div>
-                                <field name="purchase_refund_sequence_prefix" class="oe_form_inline"/>
-                                <field name="purchase_refund_sequence_next" class="oe_form_inline"
+                                <field name="purchase_refund_sequence_prefix" class="oe_inline"/>
+                                <field name="purchase_refund_sequence_next" class="oe_inline"
                                   attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
                             </div>
                             <field name="module_account_payment"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 45f42a3ab1a..e99f552389e 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -131,8 +131,8 @@
                                         <field name="date"/>
                                         <label for="amount_currency"/>
                                         <div>
-                                            <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
-                                            <field name="currency" nolabel="1" class="oe_form_inline"/>
+                                            <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_inline"/>
                                         </div>
                                         <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -151,8 +151,8 @@
                                     <group col="4" string="General Information">
                                         <label for="amount"/>
                                         <div>
-                                            <field name="amount" class="oe_form_inline"/>
-                                            <field name="company_currency" class="oe_form_inline"/>
+                                            <field name="amount" class="oe_inline"/>
+                                            <field name="company_currency" class="oe_inline"/>
                                         </div>
                                         <separator colspan="4" string="Entry Information"/>
                                         <field name="create_date" readonly="1"/>
@@ -259,8 +259,8 @@
                                 <field name="date"/>
                                 <label for="amount_currency"/>
                                 <div>
-                                    <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
-                                    <field name="currency" class="oe_form_inline"/>
+                                    <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
+                                    <field name="currency" class="oe_inline"/>
                                 </div>
                                 <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index deef7c5825d..ef043891a10 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -304,8 +304,8 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
                             <label for="parter_id" /> 
                         </div>
                         <h1>
@@ -317,14 +317,14 @@
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
-                            class="oe_form_inline"
+                            class="oe_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection"
-                            class="oe_form_inline"
+                            class="oe_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
 
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 14d0b36cb3d..739d8efe993 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -90,8 +90,8 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <div class="oe_form_title">
-                        <label for="number" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="number" class="oe_edit_only"/>
                         <h1><field name="number" readonly="0" /></h1>
                     </div>
 
@@ -132,13 +132,13 @@
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
                                 <group>
-                                    <group class="oe_form_subtotal_footer" string="Total">
+                                    <group class="oe_subtotal_footer" string="Total">
                                         <field name="tax_id" 
                                             on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                             widget="selection"
                                             domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                         <field name="tax_amount" nolabel="1"/>
-                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
+                                        <field name="amount" class="oe_subtotal_footer_separator" />
                                         <button type="object"
                                             icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
@@ -227,8 +227,8 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
-                    <div class="oe_form_title">
-                        <label for="number" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="number" class="oe_edit_only"/>
                         <h1><field name="number" readonly="0" /></h1>
                     </div>
 
@@ -271,7 +271,7 @@
                                 <group>
                                     <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
-                                <group class="oe_form_subtotal_footer">
+                                <group class="oe_subtotal_footer">
                                     <!--
                                     <div>
                                         <label for="tax_id" />
@@ -287,7 +287,7 @@
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
                                     <field name="tax_amount" />
-                                    <field name="amount" string="Total" class="oe_form_subtotal_footer_separator"/>
+                                    <field name="amount" string="Total" class="oe_subtotal_footer_separator"/>
                                 </group>                                    
 
                             </group>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5c83337044c..d33f453c662 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -29,16 +29,16 @@
                     </header>
                     <sheet>
 
-                        <div class="oe_form_title">
-                            <label for="email" string="Invitation To" class="oe_form_readonly_hidden" /> 
+                        <div class="oe_title">
+                            <label for="email" string="Invitation To" class="oe_edit_only" /> 
                             <h1>
-                                <field name="email" class="oe_form_inline" />
-                                (<field name="language" class="oe_form_inline" />)
+                                <field name="email" class="oe_inline" />
+                                (<field name="language" class="oe_inline" />)
                             </h1>
                             
                             <h2>
-                                From <field name="event_date" class="oe_form_inline" />
-                                to <field name="event_end_date" class="oe_form_inline"/>
+                                From <field name="event_date" class="oe_inline" />
+                                to <field name="event_end_date" class="oe_inline"/>
                             </h2>
                         </div>
                         <group>
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index d05abe38b4b..1d7f06eb571 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -10,9 +10,9 @@
                 <field name="property_account_payable" position="after" version="7.0">
                     <label for="vat"/>
                     <div>
-                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_form_inline"/>
-                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_form_inline"/>
-                        <field name="vat_subjected" class="oe_form_inline"/>
+                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_inline"/>
+                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/>
+                        <field name="vat_subjected" class="oe_inline"/>
                     </div>
                 </field>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d75df3384e3..dfadace719c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -93,7 +93,7 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <div class="oe_right oe_form_button_box" name="buttons">
+                    <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
                             name="%(act_crm_opportunity_crm_meeting_new)d"
                             string="Meetings" />
@@ -103,7 +103,7 @@
                             string="Phone Calls" />
                     </div>
 
-                    <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
+                    <label for="name" class="oe_edit_only" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <group>
                         <group>
@@ -125,8 +125,8 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_form_inline" placeholder="City"/>
+                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                    <field name="city" class="oe_inline" placeholder="City"/>
                                 </div>
                                 <field name="state_id" placeholder="State"/>
                                 <field name="country_id" placeholder="Country"/>
@@ -171,7 +171,7 @@
                     </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
+                <div class="oe_bottom">
                     <field name="message_ids" widget="ThreadView"/>
                 </div>
             </form>
@@ -411,7 +411,7 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
-                    <div class="oe_right oe_form_button_box">
+                    <div class="oe_right oe_button_box">
                         <button string="Schedule/Log Call"
                             name="%(opportunity2phonecall_act)d"
                             type="action"/>
@@ -419,15 +419,15 @@
                             name="action_makeMeeting"
                             type="object"/>
                     </div>
-                    <div class="oe_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
 
-                        <label for="planned_revenue" class="oe_form_readonly_hidden"/>
+                        <label for="planned_revenue" class="oe_edit_only"/>
                         <h2>
-                            <field name="planned_revenue" class="oe_form_inline"/>
-                            <field name="company_currency" class="oe_form_readonly_hidden oe_form_inline"/> at 
-                            <field name="probability" class="oe_form_inline"/> %% success rate
+                            <field name="planned_revenue" class="oe_inline"/>
+                            <field name="company_currency" class="oe_edit_only oe_inline"/> at 
+                            <field name="probability" class="oe_inline"/> %% success rate
                         </h2>
                     </div>
                     <group>
@@ -444,7 +444,7 @@
                             <label for="title_action"/>
                             <div>
                                 <field name="date_action" nolabel="1"/> -
-                                <field name="title_action" class="oe_form_inline" nolabel="1" placeholder="Call for proposal"/>
+                                <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
                             </div>
                             <field name="date_deadline"/>
                             <field name="priority"/>
@@ -480,8 +480,8 @@
                                     <field name="street" placeholder="Street..."/>
                                     <field name="street2"/>
                                     <div>
-                                        <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
-                                        <field name="city" class="oe_form_inline" placeholder="City"/>
+                                        <field name="zip" class="oe_inline" placeholder="ZIP"/>
+                                        <field name="city" class="oe_inline" placeholder="City"/>
                                     </div>
                                     <field name="state_id" placeholder="State"/>
                                     <field name="country_id" placeholder="Country"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 9123cf7c305..c855fae26cc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,32 +38,32 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
                             <label for="name" string="Title"/> 
-                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
                             <label for="allday" string="All Day?"/>)
                         </div>
                         <h1>
                             <field name="name"/>
                         </h1>
                         <h2>
-                            At <field name="location" class="oe_form_inline" />
+                            At <field name="location" class="oe_inline" />
                         </h2>
                     </div>
                     <h2>
                         <label for="duration" string="Duration" />
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)"
-                            class="oe_form_inline"/> from
+                            class="oe_inline"/> from
                         <field name="date"
                             string="Start Date" 
                             required="1"
-                            class="oe_form_readonly_hidden oe_form_inline"/> to
+                            class="oe_edit_only oe_inline"/> to
                         <field name="date_deadline" 
                             string="End Date" required="1"
                             on_change="onchange_dates(date,False,date_deadline)"                            
-                            class="oe_form_inline"/> 
+                            class="oe_inline"/> 
                     </h2>
                 <group colspan="4" col="4">
                     <group colspan="2">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 04ab8645215..0722a278fb0 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -83,12 +83,12 @@
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
-                  <div class="oe_form_title">
-                      <div class="oe_form_readonly_hidden">
+                  <div class="oe_title">
+                      <div class="oe_edit_only">
                           <label for="name" string="Title"/> 
                       </div>
                       <h1><field name="name" required="1"/></h1>
-                      <div class="oe_form_readonly_hidden">
+                      <div class="oe_edit_only">
                         <label for="partner_phone" string="Phone" />
                       </div>
                       <h2><field name="partner_phone"/></h2>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6477234ce05..acff477535c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -166,7 +166,7 @@
                         </notebook>
                     </group>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_sheet_width">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 1239dff85ff..4612fdf20a5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -45,7 +45,7 @@
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Helpdesk Support" layout="auto">
-                    <group col="4" class="oe_form_header">
+                    <group col="4" class="oe_header">
                         <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
                         <field name="user_id"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 3006dafa643..5e54f74f7f1 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -143,9 +143,9 @@
                     <field colspan="4" name="name"/>
                     <div>
                         <label string="condition" for="type"/>
-                        <field name="type" class="oe_form_inline"/>
-                        <field name="operator" class="oe_form_inline"/>
-                        <field name="max_value" class="oe_form_inline"/>
+                        <field name="type" class="oe_inline"/>
+                        <field name="operator" class="oe_inline"/>
+                        <field name="max_value" class="oe_inline"/>
                     </div>
                     <group col="4">
                         <field name="list_price"/>
@@ -260,7 +260,7 @@
                     <group>
                         <label for="carrier_id"/>
                         <div>
-                            <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_form_inline"/>
+                            <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
                             <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index b9b385e9a07..88e09824b9b 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -19,7 +19,7 @@
             <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
                     <td class="oe_edi_view">
-                        <p class="oe_form_paragraph"><t t-raw="widget.content"/></p>
+                        <p class="oe_paragraph"><t t-raw="widget.content"/></p>
                         <button type="button" class="oe_edi_action_print">
                             View/Print <img src="/edi/static/src/img/pdf.png"/>
                         </button>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 01b41833a65..ffb15eb8cb6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -63,13 +63,13 @@
                 <sheet>
 
                 <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_form_title">
+                <div class="oe_title">
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
                             <field name="type" on_change="onchange_event_type(type,context)"/>
                             <field name="user_id"/>
-                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
+                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
                         </group>
                         <group>
                             <field name="date_begin"/>
@@ -85,12 +85,12 @@
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     <page string="Internal Data">
-                         <group class="oe_form_group_label_border" colspan="2" col="2">
+                         <group class="oe_group_label_border" colspan="2" col="2">
                             <field name="register_current"/>
                             <field name="register_prospect"/>
                             <field name="register_attended"/>
                          </group> 
-                         <group class="oe_form_group_label_border" colspan="2" col="2">
+                         <group class="oe_group_label_border" colspan="2" col="2">
                             <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                             <field name="speaker_confirmed"/>
                         </group>
@@ -130,7 +130,7 @@
                     </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
             </form>
@@ -406,7 +406,7 @@
 
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
+                    <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </form>
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index 9aa693e53c6..bd871eafe6b 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -59,7 +59,7 @@ openerp.event = function(instance, mod) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
                 // TODO repalce by widget_option selector self.options.selector
-                var el = self.view.$element.find(".oe_form_google_map")[0];
+                var el = self.view.$element.find(".oe_google_map")[0];
                 self.map.render_map(address,el);
             });
         },
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index db85a0f76ef..c5fd64e586c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,18 +22,18 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                    <div class="oe_right oe_form_button_box">
+                    <div class="oe_right oe_button_box">
                         <!-- Put here related buttons -->
                     </div>
                     <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <div class="oe_form_title">
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
 
-                        <label for="company_id" class="oe_form_readonly_hidden" groups="base.group_multi_company"/>
+                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
                         <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
 
-                        <label for="department_id" class="oe_form_readonly_hidden"/>
+                        <label for="department_id" class="oe_edit_only"/>
                         <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
                     </div>
                     <notebook>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index dfe16a33357..4342fb145e5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -99,7 +99,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <div class="oe_sheet_width">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
                 </form>
@@ -143,7 +143,7 @@
                     </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_sheet_width">
+            <div class="oe_sheet_width">
                 <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
             </div>
             </form>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 9251777dce4..4770e82481e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -266,9 +266,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
-                    <label for="date_from" class="oe_form_readonly_hidden" string="Period"/>
+                    <label for="date_from" class="oe_edit_only" string="Period"/>
                     <h2>
                         from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
                         to <field name="date_to"/>
@@ -590,9 +590,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Rules" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_id" class="oe_form_readonly_hidden"/>
+                    <label for="category_id" class="oe_edit_only"/>
                     <h2><field name="category_id"/></h2>
 
                     <group col="4">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ae4cc365ec4..2e103845212 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -98,7 +98,7 @@
                 <field name="stage_id" widget="statusbar"/>
             </header>
             <sheet>
-                <div class="oe_right oe_form_button_box">
+                <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" type="object"
                         string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" type="action"
@@ -109,10 +109,10 @@
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                 </div>
-                <div class="oe_form_title">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                <div class="oe_title">
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="partner_name" class="oe_form_readonly_hidden"/>
+                    <label for="partner_name" class="oe_edit_only"/>
                     <h2><field name="partner_name"/></h2>
                     <field name="type_id" placeholder="Degree"/>
                 </div>
@@ -138,9 +138,9 @@
                             <group string="Contact">
                                 <label for="partner_id"/>
                                 <div>
-                                    <field name="partner_id" class="oe_form_inline"
+                                    <field name="partner_id" class="oe_inline"
                                         on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button class="oe_form_inline"
+                                    <button class="oe_inline"
                                         string="Create" help="Create a new contact for this applicant" icon="gtk-index"
                                         name="%(action_hr_recruitment_partner_create)d" type="action"
                                         attrs="{'invisible':[('partner_id','!=',False)]}"/>
@@ -343,8 +343,8 @@
             <field name="expected_employees" version="7.0" position="after">
                 <label for="survey_id" />
                 <div>
-                    <field name="survey_id" class="oe_form_inline"/>
-                    <button class="oe_form_inline"
+                    <field name="survey_id" class="oe_inline"/>
+                    <button class="oe_inline"
                         string="Interview" icon="gtk-print"
                         name="action_print_survey" type="object"
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cb658f46704..3ed1b943ced 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -71,9 +71,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
-                    <label for="date_from" class="oe_form_readonly_hidden" string="Timesheet Period"/>
+                    <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
                     <h2>
                         From <field name="date_from"/>
                         to <field name="date_to"/>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 3f41cc28fbf..10f703101ff 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,7 +72,7 @@
                     <button name="idea_cancel" string="Refuse" states="open" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="category_ids"/>
                     <h2><field name="category_ids"/></h2>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 179486a4d93..339c8fba817 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -82,10 +82,10 @@
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
                     <sheet>
-                        <label for="subject" class="oe_form_readonly_hidden"/>
+                        <label for="subject" class="oe_edit_only"/>
                         <h1><field name="subject"/></h1>
                         <label for="user_id"/>
-                        <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
+                        <h2><field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/></h2>
                         <group col="4">
                             <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
                             <field name="type"/>
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 7cb98129a3c..428f53d092e 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -27,7 +27,7 @@
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">
-                    <div class="oe_form_bottom">
+                    <div class="oe_bottom">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                     </div>
                 </xpath>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 5cd0839d800..32f8e5b3a72 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -155,7 +155,7 @@
                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
-                           <field name="sync_last_date" class="oe_form_inline"/>
+                           <field name="sync_last_date" class="oe_inline"/>
                            <button string="Synchronize Manually" states="running" name="synchroniz" type="object"/>
                        </div>
                        <field name="date_next_sync"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d82b475e351..8559a679beb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -322,13 +322,13 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
                 	<sheet>
-	                    <label for="product_id" class="oe_form_readonly_hidden"/>
+	                    <label for="product_id" class="oe_edit_only"/>
 	                    <h1>
-	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
-	                        <field name="product_qty" class="oe_form_inline"/>
-	                        <field name="product_uom" class="oe_form_inline"/>
+	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>: 
+	                        <field name="product_qty" class="oe_inline"/>
+	                        <field name="product_uom" class="oe_inline"/>
 	                    </h1>
-	                    <label for="routing_id" class="oe_form_readonly_hidden"/>
+	                    <label for="routing_id" class="oe_edit_only"/>
 	                    <h2>
 	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
 	                    </h2>
@@ -613,17 +613,17 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <label for="product_id" class="oe_edit_only"/>
                     <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_form_inline"/>
-                        <field name="product_qty" class="oe_form_inline"/>
-                        <field name="product_uom" class="oe_form_inline"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
+                        <field name="product_qty" class="oe_inline"/>
+                        <field name="product_uom" class="oe_inline"/>
                         <button type="action"
-                            icon="terp-accessories-archiver+" class="oe_form_inline"
+                            icon="terp-accessories-archiver+" class="oe_inline"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
                     </h1>
-                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_form_readonly_hidden"/>
+                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_edit_only"/>
                     <h2>
                         <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     </h2>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6e40bb8fd26..93ad144e16e 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -43,11 +43,11 @@
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </header>
                <sheet string="Repairs order">
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <label for="product_id" class="oe_edit_only"/>
                     <h1>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                     </h1>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h2>
                         <field name="name"/>
                     </h2>
@@ -112,7 +112,7 @@
                                 <field name="price_subtotal"/>
                             </tree>
                         </field>
-                        <group class="oe_form_subtotal_footer">
+                        <group class="oe_subtotal_footer">
                             <field name="amount_untaxed" sum="Untaxed amount"/>
                             <field name="amount_tax"/>
                             <field name="amount_total" sum="Total amount"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 33ae06d53d5..5f568f10807 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -58,7 +58,7 @@
                                     </group>
                                 </form>
                             </field>
-                            <group class="oe_form_subtotal_footer">
+                            <group class="oe_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index f8a3e9ef5f9..bd0693f0a8c 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -74,7 +74,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Listprices Items" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field colspan="4" name="name"/></h1>
 
                     <group col="4">
@@ -140,7 +140,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Price List" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name"/>
                     </h1>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a479e9a72e1..ce95cc8a044 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <form string="Product" layout="auto" version="7.0">
                     <sheet>
-                        <field name="product_image" widget="image" class="oe_form_avatar oe_right" />
+                        <field name="product_image" widget="image" class="oe_avatar oe_right" />
 
-                        <div class="oe_form_title">
-                            <div class="oe_form_readonly_hidden">
+                        <div class="oe_title">
+                            <div class="oe_edit_only">
                                 <label for="name" string="Product Name" /> 
                             </div>
                             <h1>
                                 <field name="name"/>
                             </h1>
-                            <label for="categ_id" class="oe_form_readonly_hidden" />
+                            <label for="categ_id" class="oe_edit_only" />
                             <h2><field name="categ_id" /></h2>
                         </div>
                         <notebook>
@@ -637,9 +637,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="categ_id" class="oe_form_readonly_hidden"/>
+                    <label for="categ_id" class="oe_edit_only"/>
                     <h2><field name="categ_id"/></h2>
                     <notebook>
                         <page string="Information">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 66b50a20433..5b86e75ac7a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -31,11 +31,11 @@
                 </header>
                 <sheet string="Project" layout="auto">
                     <field name="analytic_account_id" invisible="1" required="0"/>
-                    <label for="name" class="oe_form_readonly_hidden" string="Project Name"/>
+                    <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="parent_id" class="oe_form_readonly_hidden" string="Parent Project"/>
+                    <label for="parent_id" class="oe_edit_only" string="Parent Project"/>
                     <h2>
                         <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                     </h2>
@@ -346,11 +346,11 @@
                         <field name="stage_id" widget="statusbar"/>
                     </header>
                     <sheet string="Task">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id"  on_change="onchange_project(project_id)"/>
                     </h2>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 30e6bfa91dd..2b93cfec105 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -75,9 +75,9 @@
                     <field name="stage_id" widget="statusbar"/>
                 </header>
                 <sheet string="Issue">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2><field name="project_id" required="True" on_change="on_change_project(project_id)"/></h2>
                     <group>
                         <group>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 119d6c1c90e..18babab66a4 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -151,9 +151,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <label for="project_id" class="oe_edit_only"/>
                     <h2>
                         <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
                     </h2>
@@ -164,7 +164,7 @@
                         </group><group>
                             <label for="duration"/>
                             <div>
-                                <field name="duration" class="oe_form_inline"/>
+                                <field name="duration" class="oe_inline"/>
                                 <field name="product_uom"/>
                             </div>
                         </group>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 147aaa1e159..5c107d984ce 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -128,14 +128,14 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_form_button_hi"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_form_button_hi"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
@@ -146,7 +146,7 @@
                     <h1>
                         <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
                         <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_form_inline" readonly="1"/>
+                        <field name="name" class="oe_inline" readonly="1"/>
                     </h1>
                     <group>
                         <group>
@@ -173,10 +173,10 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer">
+                            <group class="oe_subtotal_footer">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <div class="oe_clear"/>
@@ -333,16 +333,16 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                     <sheet>
-                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="product_id" class="oe_form_readonly_hidden"/>
+                        <label for="product_id" class="oe_edit_only"/>
                         <group>
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
                                 <label for="product_qty"/>
                                 <div>
-                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
-                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
                                 </div>
                                 <field name="price_unit"/>
                             </group>
@@ -396,12 +396,12 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                 	<sheet>
-	                    <label for="order_id" class="oe_form_readonly_hidden"/>
+	                    <label for="order_id" class="oe_edit_only"/>
 	                    <h1>
-	                        <field name="order_id" class="oe_form_inline"/>, 
-	                        <field name="date_order" class="oe_form_inline"/>
+	                        <field name="order_id" class="oe_inline"/>, 
+	                        <field name="date_order" class="oe_inline"/>
 	                    </h1>
-	                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+	                    <label for="partner_id" class="oe_edit_only"/>
 	                    <h2><field name="partner_id"/></h2>
 	
 	                    <group>
@@ -410,8 +410,8 @@
 	                            <field name="product_id" readonly="1"/>
 	                            <label for="product_qty"/>
 	                            <div>
-	                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
-	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
+	                                <field name="product_qty" readonly="1" class="oe_inline"/>
+	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
 	                            </div>
 	                            <field name="price_unit"/>
 	                        </group>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index dc13be5b1ec..7d5c6ee4b79 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -41,10 +41,10 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <label for="name" class="oe_form_readonly_hidden"/>
+                <label for="name" class="oe_edit_only"/>
                 <h1>
-                    <field name="name" class="oe_form_inline"/>, 
-                    <field name="origin" class="oe_form_inline"/>
+                    <field name="name" class="oe_inline"/>, 
+                    <field name="origin" class="oe_inline"/>
                 </h1>
                 <group>
                     <group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 74967040753..e2d04f2da3b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Shop" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
@@ -107,13 +107,13 @@
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
                         <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                         <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
                         <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
-                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
+                        <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
                         <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_hi" type="object"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
                           attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
@@ -129,7 +129,7 @@
                     <h1>
                         <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
                         <label string="Sale Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_form_inline" readonly="1"/>
+                        <field name="name" class="oe_inline" readonly="1"/>
                     </h1>
                     <group>
                         <group>
@@ -163,16 +163,16 @@
                                             <div>
                                                 <field
                                                     context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                    name="product_uom_qty" class="oe_form_inline"
+                                                    name="product_uom_qty" class="oe_inline"
                                                     on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"
+                                                <field name="product_uom" groups="product.group_uom" class="oe_inline"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
 
                                             </div>
                                             <label for="product_uos_qty"/>
                                             <div>
-                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_form_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
@@ -217,10 +217,10 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer" colspan="2" name="sale_total">
+                            <group class="oe_subtotal_footer" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
                             <separator string="Notes"/>
                             <field name="note" placeholder="Add a global note on the sale order..."/>
@@ -420,9 +420,9 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
                     <sheet>
-                    <label for="order_id" class="oe_form_readonly_hidden"/>
+                    <label for="order_id" class="oe_edit_only"/>
                     <h1><field name="order_id"/></h1>
-                    <label for="order_partner_id" class="oe_form_readonly_hidden"/>
+                    <label for="order_partner_id" class="oe_edit_only"/>
                     <h2><field name="order_partner_id"/></h2>
                     <group>
                         <group>
@@ -430,8 +430,8 @@
                             <field name="name" groups="base.group_no_one"/>
                             <label name="product_uom_qty"/>
                             <div>
-                                <field name="product_uom_qty" readonly="1" class="oe_form_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                <field name="product_uom_qty" readonly="1" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                             </div>
                         </group><group>
                             <field name="price_unit"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 7ec91f73dca..05c46fb2618 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,7 +8,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
+            <xpath expr="//group[@class='oe_subtotal_footer']" position="inside">
                 <field name="margin"/>
             </xpath>
         </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 63d22f4fab8..09fa784e56a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -108,10 +108,10 @@
                         <field name="incoming_qty"/>
                         <label for="virtual_available" />
                         <div>
-                            <field name="virtual_available" class="oe_form_inline" />
+                            <field name="virtual_available" class="oe_inline" />
 
                             <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_form_inline" />
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline" />
                         </div>
                         <field name="outgoing_qty"/>
                     </group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 316a9d987fa..ff75c333b11 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,8 +119,8 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div class="oe_form_title">
-                        <div class="oe_form_readonly_hidden">
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
                             <label for="name"  /> 
                         </div>
                         <h1>
@@ -509,9 +509,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="location_id" class="oe_form_readonly_hidden"/>
+                    <label for="location_id" class="oe_edit_only"/>
                     <h2><field name="location_id"/></h2>
                     <group>
                         <group string="Additional Information">
@@ -625,7 +625,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse" version="7.0">
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
@@ -727,13 +727,13 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_form_inline"/>
+                        <field name="name" class="oe_inline"/>
                         <span attr="{'invisible': [('origin','=',False)]}"> - </span>
-                        <field name="origin" placeholder="PO0032" class="oe_form_inline"/>
+                        <field name="origin" placeholder="PO0032" class="oe_inline"/>
                     </h1>
-                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+                    <label for="partner_id" class="oe_edit_only"/>
                     <h2>
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
                     </h2>
@@ -795,8 +795,8 @@
                                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
                                             <label for="product_qty"/>
                                             <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                                                 <button name="%(stock.move_scrap)d"
                                                         string="Scrap" type="action"
                                                         icon="gtk-convert" context="{'scrap': True}"
@@ -804,8 +804,8 @@
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div>
-                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
                                             </div>
                                             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
                                         </group>
@@ -824,7 +824,7 @@
                                         <group groups="stock.group_tracking_lot" string="Traceability">
                                             <label for="tracking_id"/>
                                             <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                                                 <button name="%(split_into)d" string="New Pack" type="action"
                                                       groups="product.group_stock_packaging"
                                                       icon="terp-stock_effects-object-colorize"
@@ -836,7 +836,7 @@
                                                 <field name="prodlot_id" groups="stock.group_production_lot"
                                                     context="{'location_id':location_id, 'product_id':product_id}"
                                                     domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
                                                 <button name="%(track_line)d"
                                                     groups="stock.group_tracking_lot"
                                                     states="draft,waiting,confirmed,assigned"
@@ -1088,7 +1088,7 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_bottom">
+                        <div class="oe_bottom">
                             <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
                         </div>
                     </xpath>
@@ -1229,8 +1229,8 @@
                             <div>
                                 <field name="product_qty"
                                     on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
-                                    class="oe_form_inline"/>
-                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                    class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
@@ -1241,8 +1241,8 @@
                                 <field name="product_uos_qty" 
                                     groups="product.group_uos" 
                                     on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
-                                    class="oe_form_inline"/>
-                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
+                                    class="oe_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/>
                             </div>
                             <field name="name" string="Reason"/>
                         </group>
@@ -1260,7 +1260,7 @@
                         <group>
                             <label for="tracking_id"/>
                             <div>
-                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
                                       groups="product.group_stock_packaging"
                                       icon="terp-stock_effects-object-colorize"
@@ -1270,7 +1270,7 @@
                             <div>
                                 <field name="prodlot_id" groups="stock.group_production_lot"
                                     context="{'location_id':location_id, 'product_id':product_id}"
-                                    domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                    domain="[('product_id','=?',product_id)]" class="oe_inline"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                                 <button name="%(track_line)d"
                                     groups="stock.group_tracking_lot"
@@ -1417,8 +1417,8 @@
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
@@ -1426,7 +1426,7 @@
                         </div>
                         <label for="product_uos_qty"/>
                         <div>
-                            <field name="product_uos_qty" groups="product.group_uos" class="oe_form_inline"
+                            <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
@@ -1446,7 +1446,7 @@
                     <group>
                         <label name="tracking_id"/>
                         <div>
-                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                             <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
@@ -1456,10 +1456,10 @@
                         <div>
                             <field name="prodlot_id" groups="stock.group_production_lot"
                                 context="{'location_id':location_id, 'product_id':product_id}"
-                                domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                domain="[('product_id','=?',product_id)]" class="oe_inline"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                             <button name="%(track_line)d"
-                                  groups="stock.group_tracking_lot" class="oe_form_inline"
+                                  groups="stock.group_tracking_lot" class="oe_inline"
                                   states="draft,waiting,confirmed,assigned,done"
                                   string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
                         </div>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 1cf08d8cadf..36c28075595 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -51,8 +51,8 @@
                         <field name="product_id"  readonly="1"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty" class="oe_form_inline"/>
-                            <field name="product_uom" class="oe_form_inline" readonly="1"/>
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" readonly="1"/>
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
@@ -83,8 +83,8 @@
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
                         <div>
-                            <field name="qty" readonly="1" class="oe_form_inline"/>
-                            <field name="product_uom" readonly="1" class="oe_form_inline"/>
+                            <field name="qty" readonly="1" class="oe_inline"/>
+                            <field name="product_uom" readonly="1" class="oe_inline"/>
                         </div>
                         <field name="location_id" invisible="1"/>
                         <field name="use_exist"/>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 0ae33cec3af..05b3c5a213f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -87,7 +87,7 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Stock and Sales Forecast" layout="auto">
-                    <group colspan = "4" col = "4" class="oe_form_header">
+                    <group colspan = "4" col = "4" class="oe_header">
                         <group colspan = "2" col="2" >
                             <field name="company_id" select="1"
                                         groups="base.group_multi_company"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 3419b96d2a1..1e8fd5c9e2c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1067,7 +1067,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>
                 <sheet string="Survey Request" layout="auto">
-                    <group class="oe_form_header">
+                    <group class="oe_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>

From a8922e5dde982a15e4d62bbf615fca70695da7f2 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Jun 2012 10:08:14 +0200
Subject: [PATCH 6/9] [IMP] restyle buttons of some wizards

bzr revid: rco@openerp.com-20120620080814-ynha15jlkyhrbyba
---
 openerp/addons/base/res/res_config.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index e043afb0b7e..d9cc5414e69 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -7,12 +7,12 @@
       <field name="arch" type="xml">
           <form version="7.0">
              <header>
-               <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                       type="object" string="Cancel" colspan="1"/>
-               <button name="action_next" icon="gtk-go-forward"
-                       type="object" string="Apply" colspan="1"/>
+               <button name="action_next" type="object"
+                       string="Apply" icon="gtk-go-forward" class="oe_highlight"/>
+               <button name="action_skip" type="object" special="cancel"
+                       string="Cancel" icon="gtk-jump-to"/>
              </header>
-             <group string="res_config_contents" col="4"/>
+             <group string="res_config_contents"/>
           </form>
       </field>
     </record>
@@ -24,8 +24,8 @@
       <field name="arch" type="xml">
         <form string="Next Configuration Step" version="7.0">
             <header>
-                <button name="action_next" icon="gtk-go-forward"
-                        type="object" string="Continue"/>
+                <button name="action_next" type="object"
+                        string="Continue" icon="gtk-go-forward" class="oe_highlight"/>
             </header>
             <field name="note"/>
         </form>
@@ -39,10 +39,10 @@
       <field name="arch" type="xml">
         <form version="7.0">
             <header>
-                <button name="action_skip" icon="gtk-jump-to" special="cancel"
-                        type="object" string="Cancel" colspan="1"/>
-                <button name="action_next" icon="gtk-go-forward"
-                        type="object" string="Install Modules" colspan="1"/>
+                <button name="action_next" type="object"
+                    string="Install Modules" icon="gtk-go-forward" class="oe_highlight"/>
+                <button name="action_skip" type="object" special="cancel"
+                    string="Cancel" icon="gtk-jump-to"/>
             </header>
             <separator string="title" colspan="4"/>
         </form>

From 590937d49a802f4565daa712f1e0d63c96b0bf6b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 20 Jun 2012 11:45:20 +0200
Subject: [PATCH 7/9] [FIX] listview sass

bzr revid: al@openerp.com-20120620094520-4051lhn04rpx3di1
---
 addons/web/static/src/css/base.sass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5eb61ac5f9e..82e6a39961d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1664,7 +1664,6 @@ $colour4: #8a89ba
     .oe-listview-content
         width: 100%
         td:first-child, th:first-child
-            width: 17px
             &:after
                 border-width: 0
         > thead

From d8839589d924484e5e84dbe3484f987aa4ce76cb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Jun 2012 11:47:14 +0200
Subject: [PATCH 8/9] [IMP] res_partner: reintroduce filters 'Customers' and
 'Suppliers' in search form

bzr revid: rco@openerp.com-20120620094714-jexi93e701ui4d8q
---
 openerp/addons/base/res/res_partner_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index e4f6b164e2f..e2041b28ffa 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -262,6 +262,9 @@
                         <separator orientation="vertical"/>
                         <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
                         <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
                    </group>
                    <newline />
                    <group expand="0" string="Group By...">

From 03450a0fc8507eeb1e76e8f2a580c37d12574d69 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 20 Jun 2012 11:58:12 +0200
Subject: [PATCH 9/9] [FIX] name_get of res.partner and res.partner.category,
 to accept an int as ids

bzr revid: rco@openerp.com-20120620095812-6kl28dcry2fx8op6
---
 openerp/addons/base/res/res_partner.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1dbad434ed6..14acbceb91c 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -50,6 +50,8 @@ class res_partner_category(osv.osv):
             context = {}
         if context.get('partner_category_display') == 'short':
             return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads:
@@ -285,7 +287,9 @@ class res_partner(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        if not len(ids):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
             return []
         if context.get('show_ref'):
             rec_name = 'ref'