diff --git a/addons/account/account.py b/addons/account/account.py
index caf1d68c45d..571ea40698d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1862,8 +1862,10 @@ class account_tax(osv.osv):
         'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
             help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
         'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
-        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
-        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'),
+        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."),
+        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."),
+        'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
+        'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."),
         'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
         'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
         'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
@@ -2001,6 +2003,8 @@ class account_tax(osv.osv):
                     'name':tax.description and tax.description + " - " + tax.name or tax.name,
                     'account_collected_id':tax.account_collected_id.id,
                     'account_paid_id':tax.account_paid_id.id,
+                    'account_analytic_collected_id': tax.account_analytic_collected_id.id,
+                    'account_analytic_paid_id': tax.account_analytic_paid_id.id,
                     'base_code_id': tax.base_code_id.id,
                     'ref_base_code_id': tax.ref_base_code_id.id,
                     'sequence': tax.sequence,
@@ -2066,7 +2070,20 @@ class account_tax(osv.osv):
                 'taxes': []                  # List of taxes, see compute for the format
             }
         """
+
+        # By default, for each tax, tax amount will first be computed
+        # and rounded at the 'Account' decimal precision for each
+        # PO/SO/invoice line and then these rounded amounts will be
+        # summed, leading to the total amount for that tax. But, if the
+        # company has tax_calculation_rounding_method = round_globally,
+        # we still follow the same method, but we use a much larger
+        # precision when we round the tax amount for each line (we use
+        # the 'Account' decimal precision + 5), and that way it's like
+        # rounding after the sum of the tax amounts of each line
         precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        tax_compute_precision = precision
+        if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
+            tax_compute_precision += 5
         totalin = totalex = round(price_unit * quantity, precision)
         tin = []
         tex = []
@@ -2075,7 +2092,7 @@ class account_tax(osv.osv):
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tin:
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
@@ -2083,7 +2100,7 @@ class account_tax(osv.osv):
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tex:
             totalin += r.get('amount', 0.0)
         return {
@@ -2096,7 +2113,7 @@ class account_tax(osv.osv):
         _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -2105,14 +2122,15 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
         total = 0.0
-        precision_pool = self.pool.get('decimal.precision')
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
             else:
-                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
                 total += r['amount']
         return res
 
@@ -2160,6 +2178,8 @@ class account_tax(osv.osv):
                 'amount': amount,
                 'account_collected_id': tax.account_collected_id.id,
                 'account_paid_id': tax.account_paid_id.id,
+                'account_analytic_collected_id': tax.account_analytic_collected_id.id,
+                'account_analytic_paid_id': tax.account_analytic_paid_id.id,
                 'base_code_id': tax.base_code_id.id,
                 'ref_base_code_id': tax.ref_base_code_id.id,
                 'sequence': tax.sequence,
@@ -2188,7 +2208,7 @@ class account_tax(osv.osv):
             r['todo'] = 0
         return res
 
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
         Price Unit is a VAT included price
@@ -2198,15 +2218,15 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
         total = 0.0
-        obj_precision = self.pool.get('decimal.precision')
         for r in res:
-            prec = obj_precision.precision_get(cr, uid, 'Account')
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, prec) - total
+                r['amount'] = round(r['balance'] * quantity, precision) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, prec)
+                r['amount'] = round(r['amount'] * quantity, precision)
                 total += r['amount']
         return res
 
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index cbc5a966f79..ef146128a67 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -43,6 +43,12 @@ class bank(osv.osv):
         "Return the name to use when creating a bank journal"
         return (bank.bank_name or '') + ' ' + bank.acc_number
 
+    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+        """Add ability to have %(currency_name)s in the format_layout of
+        res.partner.bank.type"""
+        bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
+        return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
+
     def post_write(self, cr, uid, ids, context={}):
         if isinstance(ids, (int, long)):
           ids = [ids]
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c6011979f8d..5e27a2e3663 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -756,7 +756,7 @@ class account_invoice(osv.osv):
             for tax in inv.tax_line:
                 if tax.manual:
                     continue
-                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
+                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id)
                 tax_key.append(key)
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !'))
@@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
             'quantity': x.get('quantity',1.00),
             'product_id': x.get('product_id', False),
             'product_uom_id': x.get('uos_id', False),
-            'analytic_account_id': x.get('account_analytic_id', False),
+            'analytic_account_id': x.get('analytic_account_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1578,6 +1578,7 @@ class account_invoice_tax(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'manual': fields.boolean('Manual'),
@@ -1648,14 +1649,16 @@ class account_invoice_tax(osv.osv):
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_collected_id'] or line.account_id.id
+                    val['account_analytic_id'] = tax['account_analytic_collected_id']
                 else:
                     val['base_code_id'] = tax['ref_base_code_id']
                     val['tax_code_id'] = tax['ref_tax_code_id']
                     val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
+                    val['account_analytic_id'] = tax['account_analytic_paid_id']
 
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
                 if not key in tax_grouped:
                     tax_grouped[key] = val
                 else:
@@ -1687,7 +1690,8 @@ class account_invoice_tax(osv.osv):
                 'price': t['amount'] or 0.0,
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
-                'tax_amount': t['tax_amount']
+                'tax_amount': t['tax_amount'],
+                'analytic_account_id': t['account_analytic_id'],
             })
         return res
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7121094641c..bc964b787c7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -98,6 +98,7 @@
                         <field name="name"/>
                         <field name="sequence"/>
                         <field name="account_id" groups="account.group_account_user"/>
+                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -215,6 +216,7 @@
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
                                             <field name="account_id" groups="account.group_account_invoice"/>
+                                            <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
                                             <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                             <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a89473af134..80202d97d6c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -909,9 +909,9 @@
                                   <field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
                                   <separator colspan="4" string="Accounting Information"/>
                                   <field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
+                                  <field name="account_analytic_collected_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
                                   <field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                  <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
+                                  <field name="account_analytic_paid_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '&lt;&gt;', False)]" groups="analytic.group_analytic_accounting"/>
                                   <separator colspan="4" string="Tax Declaration: Invoices"/>
                                   <field name="base_code_id"/>
                                   <field name="base_sign"/>
diff --git a/addons/account/company.py b/addons/account/company.py
index 932f7750faa..3bb241a42a6 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -25,6 +25,11 @@ class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
+        'tax_calculation_rounding_method': fields.selection([
+            ('round_per_line', 'Round per Line'),
+            ('round_globally', 'Round Globally'),
+            ], 'Tax Calculation Rounding Method',
+            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
         'property_reserve_and_surplus_account': fields.property(
@@ -39,6 +44,7 @@ class res_company(osv.osv):
 
     _defaults = {
         'expects_chart_of_accounts': True,
+        'tax_calculation_rounding_method': 'round_per_line',
         'overdue_msg': '''Dear Sir, dear Madam,
 
 Our records indicate that some payments on your account are still due. Please find details below.
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index b8c595f3ca0..5aa1c76cc5e 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -24,6 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
+                      <field name="tax_calculation_rounding_method"/>
                       <field name="paypal_account"  placeholder="sales@openerp.com"/>
                 </field>
             </field>
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 09b4a8b9ac4..96edc80159f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:17+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-07-11 03:05+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4963,7 +4963,7 @@ msgstr "资产负债表"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "一般账簿"
+msgstr "总账账簿"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5702,7 +5702,7 @@ msgstr "发票税科目"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr "一般账簿"
+msgstr "科目总账账簿"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -10184,7 +10184,7 @@ msgstr "周期次数"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "一般账簿"
+msgstr "总账账簿"
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8ca35426427..16f37f05301 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -49,6 +49,12 @@ class account_config_settings(osv.osv_memory):
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
         'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+        'tax_calculation_rounding_method': fields.related('company_id',
+            'tax_calculation_rounding_method', type='selection', selection=[
+            ('round_per_line', 'Round per Line'),
+            ('round_globally', 'Round Globally'),
+            ], string='Tax Calculation Rounding Method',
+            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
         'sale_tax_rate': fields.float('Sales Tax (%)'),
@@ -152,6 +158,7 @@ class account_config_settings(osv.osv_memory):
             'has_chart_of_accounts': has_chart_of_accounts,
             'has_fiscal_year': bool(fiscalyear_count),
             'chart_template_id': False,
+            'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
         }
         # update journals and sequences
         for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index d7eda0a2692..70381a68c82 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -76,6 +76,7 @@
                         <group>
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="tax_calculation_rounding_method"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
                         </group>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index d0ff56924e9..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,11 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
@@ -26,6 +21,11 @@
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
+                    <footer>
+                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 322c33aec76..7e33e61eec8 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
-                    <header>
-                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
                     </group>
+                    <footer>
+                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 83c49fe665a..d7820caa647 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -20,6 +15,11 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8827edba591..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <header>
-                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
@@ -22,6 +17,11 @@
                         <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
                         <field name="report_name"/>
                     </group>
+                    <footer>
+                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 9d38b2034bd..08db574e9ac 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <header>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
                          <field name="description"/>
@@ -24,6 +19,11 @@
                     <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
                     <label string="Credit Note: Creates the credit note, ready for editing."/>
                     <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
+                    <footer>
+                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 5658143f4e1..0ea2eefebc5 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,14 +6,14 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Confirm Draft Invoices" version="7.0">
-	                <header>
-	                    <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Confirm Draft Invoices"/>
-	            </form>
+                <form string="Confirm Draft Invoices" version="7.0">
+                    <separator string="Confirm Draft Invoices"/>
+                    <footer>
+                        <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -28,14 +28,14 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Cancel Selected Invoices" version="7.0">
-	                <header>
-	                    <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Cancel Selected Invoices"/>
-	            </form>
+                <form string="Cancel Selected Invoices" version="7.0">
+                    <separator string="Cancel Selected Invoices"/>
+                    <footer>
+                        <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index e2dcc05c266..af0b50168de 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Journal Select" version="7.0">
-	                <header>
-	                    <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Journal Select" version="7.0">
                     <label string="Are you sure you want to open Journal Entries?"/>
-	            </form>
+                    <footer>
+                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 02509137af5..58707c0d605 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="journal_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 862ffa0956e..1e36cc8bafe 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                          <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 1d405ae02aa..ade86e29c50 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to open Account move line entries?"/>
+                    <footer>
                         <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string="Are you sure you want to open Account move line entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ff4811f781c..63ba44ba8a7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index bedc1028b4a..7f950e4cf53 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
-                    <header>
-                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
+                    <footer>
+                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index c285db512cf..c6aa828e3ce 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
-                    <header>
-                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Are you sure?">
                         <field name="sure"/>
                     </group>
+                    <footer>
+                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 552907da0c8..ffa298bf22d 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
-                    <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
-                    </header>
                     <group col="4">
                         <field name="next_partner_id"/>
                         <field name="progress" widget="progressbar" colspan="4"/>
                         <field name="today_reconciled"/>
                         <field name="to_reconcile"/>
                     </group>
+                    <footer>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 4fb418e4fad..d6344f2cbc1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -8,13 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
                         <newline/>
@@ -23,6 +16,13 @@
                     </group><group string="Write-Off">
                         <field name="writeoff"/>
                     </group>
+                    <footer>
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 575af9370db..0e82603ced1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -9,11 +9,6 @@
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
                     <group col="4">
@@ -26,6 +21,11 @@
                         <field name="direction_selection"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..2711154a35e 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
-                <header>
-                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                    or 
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
@@ -38,6 +33,11 @@
                         <field name="journal_ids"/>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                    or 
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 56b72f120d2..5e53fb66d0f 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
-                    <header>
-                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <newline/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <footer>
+                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 2132851a3fe..64ca3beeb11 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <header>
-                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>
+                    <footer>
+                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 0db91912c5e..ea0c68f739f 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="period_id"/>
                         <label colspan="4" string="(If you do not select period it will take all open periods)"/>
                         <field name="target_move"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index bec668c29ec..dc3cf7b748a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                <footer>
                     <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                     or                    
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliate Transactions"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 899befeaa0a..777ab38fddf 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <header>
-	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
+	                <footer>
+	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
+	                </footer>
 	            </form>
             </field>
         </record>
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
-                    <header>
+                    <label string = "Are you sure you want to create entries?"/>
+                    <footer>
                         <button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index d5b1cff4533..abadb57c4e7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,19 +8,19 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Post Journal Entries of a Journal"/>
-	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
-	                <group>
-	                    <field name="journal_id"/>
-	                    <field name="period_id"/>
-	                </group>
-	            </form>
+                <form string="Post Journal Entries" version="7.0">
+                    <separator string="Post Journal Entries of a Journal"/>
+                    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+                    <group>
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                    </group>
+                    <footer>
+                        <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -47,15 +47,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Post Journal Entries" version="7.0">
                     <separator string="Post Journal Entries"/>
-	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
-	            </form>
+                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
+                    <footer>
+                        <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 91ea78d7bd6..988c4786bb8 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
@@ -25,6 +20,11 @@
                     <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                     <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
+                <footer>
+                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index ae95f0f7584..c25705572d1 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group col="4">
                     <field name="date1"/>
                     <field name="date2"/>
@@ -21,6 +16,11 @@
                 </group><group string="Analytic Journal">
                     <field name="journal_ids" colspan="2" nolabel="1"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index b67e61bafc6..5b8a11f2587 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -7,12 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
+                <label string="Save This Distribution as a Model"/>
+                <footer>
                     <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <label string="Save This Distribution as a Model"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
new file mode 100644
index 00000000000..060fd9f598d
--- /dev/null
+++ b/addons/account_asset/i18n/mn.po
@@ -0,0 +1,793 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-10 03:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Дуусах хугацаа"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Үлдэгдэл дүн"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Үндсэн хөрөнгө тооцоолох"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Түүхийн нэр"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Хөрөнгийн судалгаа шинжилгээ"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Хөрөнгийн зэрэглэл"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 1e8f0f969b7..15b11f4dcff 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
-                    <header>
-                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
                         <group colspan="2" col="2">
@@ -23,6 +18,11 @@
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
+                    <footer>
+                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index fee7f77d758..45d3aa22625 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <header>
-                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
+                    <footer>
+                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 44e0e9aa3a4..c08f15a7410 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
                          <field name="date_to"/>
                      </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index ee83d272edf..5f2ec7ee46c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ddfd3d00068..3e02604b746 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index afdeb62e8ed..984cbeefeef 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -8,15 +8,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
-              <header>
-                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                  or
-                  <button string="Cancel" class="oe_link" special="cancel"/>
-              </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
                   <field name="date_to"/>
               </group>
+              <footer>
+                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                  or
+                  <button string="Cancel" class="oe_link" special="cancel"/>
+              </footer>
           </form>
         </field>
       </record>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 058feedcde3..084de5c2ae6 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <header>
-                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
+                <footer>
+                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 220c592f6b5..ab90144f0e2 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
-                <header>
-                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="duedate" />
                 </group>
+                <footer>
+                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
@@ -26,14 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
-                    <header>
-                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Entries">
                         <field name="entries"/>
                     </group>
+                    <footer>
+                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ee86ed75a41..1053d47eebd 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -8,12 +8,12 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
-                    <header>
+                    <separator string="Are you sure you want to make payment?"/>
+                    <footer>
                         <button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index de1885b1014..c2789f95d38 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -8,14 +8,14 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
-                    <header>
-                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="lines"/>
                     </group>
+                    <footer>
+                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 5ecb4cd07bb..33014f394a7 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
-                    <header>
-                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="date"/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
+                    <footer>
+                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
-                    <header>
+                    <separator string="Payable and Receivables"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    <footer>
                         <button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Payable and Receivables"/>
-                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 3bfb0fcb4ec..04131b643eb 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                <footer>
                     <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index b66173323e2..fdfffb73c23 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
-                    <header>
-                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                          <field name="from"/>
                          <field name="to"/>
                     </group>
+                    <footer>
+                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index a16715e0d52..3bdb9144907 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <header>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -36,6 +31,11 @@
                             </group>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index 1abd6ff3570..4072db42318 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
-                    <header>
+                    <separator string="Relationship Graphs" colspan="6"/>
+                    <footer>
                         <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Relationship Graphs" colspan="6"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 93c38d794f4..281576b0b6a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index b947c94f871..a621ae69547 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -86,11 +86,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Module Information">
                         <field name="name"/>
                         <field name="directory_name"/>
@@ -102,6 +97,11 @@
                     </group>
                     <separator string="Description"/>
                     <field name="description"/>
+                    <footer>
+                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
          </record>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 106ad662b0f..39943697d4f 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Recording Information">
                         <field name="info_status"/>
                         <field name="info_text"/>
                         <field name="info_yaml"/>
                    </group>
+                    <footer>
+                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index c060f4a961a..12ac67e3ba0 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
-                <header>
+                <group string="Select your report">
+                    <field name="report_id"/>
+                </group>
+                <footer>
                     <button name="get_report" string="Continue" type="object" class="oe_highlight"/>
                     <button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group string="Select your report">
-                    <field name="report_id"/>
-                </group>
+                </footer>
             </form>
             </field>
        </record>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 8bf029ddbdb..7d6aaaee212 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-25 05:03+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-12 01:34+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -200,17 +200,17 @@ msgstr "どのように顧客を呼びますか"
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr "Quickbooks lppids"
+msgstr "QuickBooksのIPP / IDS"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr "取引先"
+msgstr "顧客"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr "Saleforceを取り込む"
+msgstr "Salesforceのインポート"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -249,22 +249,22 @@ msgstr "user.preferences.config"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr "追加ユーザを作成します。"
+msgstr "追加ユーザの作成"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr "顧客を作成または取り込みます。"
+msgstr "顧客の作成 / インポート"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr "SugarCRMを取り込みます。"
+msgstr "SugarCRMのインポート"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr "顧客を取り込みまたは作成します。"
+msgstr "顧客の作成 / インポート"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
@@ -279,7 +279,7 @@ msgstr "SugarCRMを取り込むために"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr "パートナー"
+msgstr "パートナ"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 3720e87cf43..122dcfe9586 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
-                    <header>
-                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
                         <field name="menu_parent_id"/>
                     </group>
+                    <footer>
+                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 29f455d764f..0c16fd0eba4 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Caldav" version="7.0">
-                    <header>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                    </header>
                     <sheet>
                         <group>
                             <separator string="Browse Caldav" colspan="4"/>
@@ -37,6 +34,9 @@
                             
                         </group>
                     </sheet>
+                    <footer>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 3f498504444..014f5500384 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 590daa34561..0601349690d 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 85f9a4aab5d..7d392135195 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -316,7 +316,7 @@
                                     <t t-if="record.date_action.raw_value"> : </t>
                                     <field name="title_action"/>
                                 </div>
-                                <div class="oe_right">
+                                <div class="oe_kanban_bottom_right">
                                     <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
                                     <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <!--
@@ -468,7 +468,7 @@
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
                             <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline"/> %% success rate
+                            <field name="probability" class="oe_inline"/>%% success rate
                         </h2>
                     </div>
                     <group>
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 7d5b564951c..4281ea13d90 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-07-09 04:50+0000\n"
+"PO-Revision-Date: 2012-07-09 05:13+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm
@@ -818,7 +818,7 @@ msgstr "作成日"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "参照2"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -838,7 +838,7 @@ msgstr "ミーティングのスケジュール"
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必要事項"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -1272,7 +1272,7 @@ msgstr "見込完了日"
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目がTrueに設定されると、営業チームを削除することなく非表示にできます。"
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -2431,17 +2431,17 @@ msgstr "私の開いている商談"
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "通信履歴の最大"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "人を招待"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "ミーティングタイプ"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2454,6 +2454,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2670,7 +2674,7 @@ msgstr "Eメールの標題"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "会議への招待"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -3097,7 +3101,7 @@ msgstr "繰り返し"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "前回終了年"
+msgstr "見込完了年"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3331,33 +3335,33 @@ msgstr "同じログインでは２つのユーザを持てません。"
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "電話のスケジュール"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "分類化"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "通話ログ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "アクションルール"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "定期的"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3372,39 +3376,39 @@ msgstr "木曜"
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "従業員の一般"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "機能"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "追加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
 #: field:crm.meeting,description:0 view:crm.phonecall:0
 #: field:crm.phonecall,description:0 field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -3416,12 +3420,12 @@ msgstr "今月なされた通話"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "アクセサリーへの関心"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3432,17 +3436,17 @@ msgstr "新規商談"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "会社の住所にEメールがありません。"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Eメールの数"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "通り"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3452,12 +3456,12 @@ msgstr "ユーザとチーム別の商談"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "ToDoにリセット"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "労働時間"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
@@ -3467,21 +3471,21 @@ msgstr "通話"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "顧客"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "最低"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3494,23 +3498,23 @@ msgstr ""
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "営業チーム"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "失注"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編集"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3542,17 +3546,17 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "キャンペーン名"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "プロファイリング"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3583,7 +3587,7 @@ msgstr "オプション"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr ""
+msgstr "交渉"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3593,12 +3597,12 @@ msgstr "見込完了"
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ウィザード"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3608,7 +3612,7 @@ msgstr "同意"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "制御変数"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 93551eaf943..fc4b57f85dc 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
-                    <header>
-                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Add Note"/>
                         <field name="body"/>
                     </group>
+                    <footer>
+                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index a240a4de66c..5ad9ef1c9c9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -6,11 +6,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
                         <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@@ -27,6 +22,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
@@ -37,11 +37,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
@@ -53,6 +48,11 @@
                             <field name="name" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ce12d62f9bf..a430c943d5d 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
-                  <header>
-                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
+                  <footer>
+                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 99de31afc15..74973193f24 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
-                    <header>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
@@ -24,6 +19,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6c921b3f071..ccabcde88fe 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
-                        or
-                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="action"/>
@@ -34,6 +28,12 @@
                         </group>
                     </group>
                     <field name="note" placeholder="Call Description" />
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
+                        or
+                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 3f37a0b6fa1..8bc97ba141b 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -9,17 +9,17 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
-                  <header>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <field name="name"/>
                       <field name="partner_id"/>
                       <field name="planned_revenue"/>
                       <field name="probability"/>
                   </group>
+                  <footer>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 85d0bf4bc47..00f6700e5a5 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -11,13 +11,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting" version="7.0">
-                    <header>
+                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    <footer>
                         <button name="action_make_meeting" type="object"
                             string="_Schedule" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 1dc14786cc3..5304bd8beb5 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <header>
-                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="planned_revenue"/>
                         <field name="probability"/>
                     </group>
+                    <footer>
+                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 3281acdeec3..1243d7bc456 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -9,14 +9,14 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
                 <newline/>
                 <label string="You may have to verify that this partner does not exist already."/>
+                <footer>
+                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
         </field>
        </record>
@@ -29,15 +29,15 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="action"/>
                     <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
                 </group>
+                <footer>
+                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 7319c1b0437..25f7dd0ba81 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="action"/>
                         <field name="name"/>
@@ -24,6 +18,12 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                     </group>
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 4fda17b5264..e70a053305f 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <header>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -46,6 +41,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 04dca6da22f..4a1291f01aa 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
-                    <header>
-                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="questionnaire_id"/>
                     </group>
+                    <footer>
+                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index a0656b5597d..52f012a92ff 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
-                    <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index efe0074b313..96ea55da9e5 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,12 +9,12 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/header/button" position="before">
-						<field name="use_template" invisible="1"/>
-						<button icon="gtk-paste" type="object" name="template_toggle"
-						        string="" help="Use a message template" />
-						<button icon="gtk-save" type="object" name="save_as_template"
-						        string="" help="Save as a new template"/>
+                    <xpath expr="//form/footer/button" position="before">
+                        <field name="use_template" invisible="1"/>
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                string="" help="Use a message template" />
+                        <button icon="gtk-save" type="object" name="save_as_template"
+                                string="" help="Save as a new template"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 040df5ce987..1a7f3ba09c5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo_xml': ['event_demo.yml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 26fef61d2b5..6a8cf9f8a0b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -55,22 +55,14 @@ class event_event(osv.osv):
               return []
         res = []
         for record in self.browse(cr, uid, ids, context=context):
-            date = record.date_begin.split(" ")
-            date = date[0]
-            registers=''
-            if record.register_max !=0:
-                register_max = str(record.register_max)
-                register_tot = record.register_current+record.register_prospect
-                register_tot = str(register_tot)
-                registers = register_tot+'/'+register_max
-            name = record.name+' ('+date+') '+registers
-            res.append((record['id'], name))
+            date = record.date_begin.split(" ")[0]
+            date_end = record.date_end.split(" ")[0]
+            if date != date_end:
+                date += ' - ' + date_end
+            display_name = record.name + ' (' + date + ')'
+            res.append((record['id'], display_name))
         return res
 
-    def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -210,10 +202,12 @@ class event_event(osv.osv):
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
-        'full_name' : fields.function(_name_get_fnc, type="char", string='Name'),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'street': fields.related('address_id','street',type='char',string='Street'),
+        'zip': fields.related('address_id','zip',type='char',string='zip'),
+        'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
@@ -302,7 +296,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['ir.needaction_mixin','mail.thread','res.partner']
+    _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -316,13 +310,16 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
+        'email': fields.char('Email', size=64),
+        'phone': fields.char('Phone', size=64),
+        'name': fields.char('Name', size=128, select=True),
     }
 
     _defaults = {
@@ -331,7 +328,6 @@ class event_registration(osv.osv):
     }
     _order = 'name, create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         self.do_draft_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -400,18 +396,15 @@ class event_registration(osv.osv):
         return True
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
-        data ={}
         if not contact:
-            return data
+            return {}
         addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
-        data = {
+        return {'value': {
             'email':contact_id.email,
-            'contact_id':contact_id.id,
             'name':contact_id.name,
             'phone':contact_id.phone,
-            }
-        return {'value': data}
+            }}
 
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
-
-
-<!-- Demo Data for Event Type -->
-    <record id="event_type_0" model="event.type">
-        <field name="name">Seminar</field>
-    </record>
-
-    <record id="event_type_1" model="event.type">
-        <field name="name">Exhibition</field>
-    </record>
-
-    <record id="event_type_2" model="event.type">
-        <field name="name">Conference</field>
-    </record>
-
-    <record id="event_type_3" model="event.type">
-        <field name="name">Show</field>
-    </record>
-
-    <record id="event_type_4" model="event.type">
-        <field name="name">Training</field>
-    </record>
-
-<!-- Demo data for Event -->
-    <record id="event_0" model="event.event">
-        <field name="name">Concert of Bon Jovi</field>
-        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="register_max">500</field>
-        <field name="type" ref="event_type_1"/>
-    </record>
-
-    <record id="event_1" model="event.event">
-        <field name="name">Opera of Verdi</field>
-        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_1"/>
-        <field name="register_min">50</field>
-        <field name="register_max">350</field>
-    </record>
-    <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Business</field>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
-        <field name="register_max">200</field>
-    </record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-
-<!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
-        <field name="name">Agrolait</field>
-        <field name="email">s.l@agrolait.be</field>
-        <field name="phone">003281588558</field>
-        <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    <record id="reg_1_2" model="event.registration">
-        <field name="name">ASUStek</field>
-        <field name="email">info@asustek.com</field>
-        <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="event_id" ref="event_1"/>
-        <field name="nb_register">10</field>
-    </record>
-
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
-    <record id="reg_0_2" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">openerp@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..6f843fd0965
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+  from datetime import datetime, timedelta
+-
+  !record {model: event.type, id: event_type_0}:
+    name: 'Seminar'
+-
+  !record {model: event.type, id: event_type_1}:
+    name: 'Exhibition'
+-
+  !record {model: event.type, id: event_type_2}:
+    name: 'Conference'
+-
+  !record {model: event.type, id: event_type_3}:
+    name: 'Show'
+-
+  !record {model: event.type, id: event_type_4}:
+    name: 'Training'
+-
+  !record {model: event.event, id: event_0}:
+    name: 'Concert of Bon Jovi'
+    date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+    date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+    register_max: 500
+    type: event_type_1
+-
+  !record {model: event.event, id: event_1}:
+    name: 'Opera of Verdi'
+    date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 21:00:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_1
+-
+  !record {model: event.event, id: event_2}:
+    name: 'Conference on ERP Business'
+    date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_2
+-
+  !record {model: event.registration, id: reg_1_1}:
+    name: 'Agrolait'
+    email: 's.l@agrolait.be'
+    phone: '003281588558'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 5
+-
+  !record {model: event.registration, id: reg_1_2}:
+    name: 'ASUStek'
+    email: 'info@asustek.com'
+    phone: '+ 1 64 61 04 01'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 10
+-
+  !record {model: event.registration, id: reg_0_1}:
+    name: 'Syleam'
+    email: 'contact@syleam.fr'
+    phone: '+33 (0) 2 33 31 22 10'
+    event_id: event_0
+    partner_id: base.res_partner_sednacom
+    nb_register: 6
+-
+  !record {model: event.registration, id: reg_0_2}:
+    name: 'Camptocamp'
+    email: 'openerp@camptocamp.com'
+    phone: '+41 21 619 10 04'
+    event_id: event_2
+    partner_id: base.res_partner_c2c
+    nb_register: 5
+ 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ea2788594b7..142ba2bb2a4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
+            view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
@@ -17,10 +24,10 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="default_reply_to"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_min"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_max"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                     </group>
                 </form>
             </field>
@@ -89,88 +96,103 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" version="7.0">
-                <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </header>
-                <sheet>
-
-                <div class="oe_right" style="height: 200px"></div>
-                <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_google_map'}"/>
-                        </group>
-                        <group>
-                            <field name="date_begin"/>
-                            <field name="date_end"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                    </group>
-                </div>
-
-                <notebook>
-                    <page string="Event Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Internal Data">
-                         <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_group_label_border" colspan="2" col="2">
-                            <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                            <field name="speaker_confirmed"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
+                <form string="Events" version="7.0">
+                    <header>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                        </div> 
+                        <div>
+                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                            </h2>
+                            <group>
+                                <group>
+                                    <label for="address_id" string="Location Address"/>
+                                    <div>
+                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                        <field name="street" placeholder="Street..."/>
+                                        <div>
+                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                    </div>
                                 </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <group>
+                                       <field name="type" on_change="onchange_event_type(type,context)"/>
+                                       <field name="register_min"/>
+                                       <field name="register_max"/>
+                                       <label for="register_current" string="Current Registrations"/>
+                                       <div>
+                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                       </div>
+                                   </group>
+                            </group>
+                        </div>
+                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <notebook>
+                            <page string="Event Description">
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Internal Data">
+                                <group>
+                                    <group>
+                                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                        <field name="speaker_confirmed"/>
                                     </group>
-                            </form>
-                            </field>
-                    </page>
-                    </notebook>
+                                    <group>
+                                        <field name="register_attended"/>
+                                    </group> 
+                                </group>
+                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                    <tree string="Registration" editable="top">
+                                        <field name="name" />
+                                        <field name="email" />
+                                        <field name="phone"/>
+                                        <field name="nb_register" />
+                                        <field name="state"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </tree>
+                                    <form string="Registration">
+                                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                        <field name="name"/>
+                                        <group colspan="4" col="4">
+                                        <field name="email"/>
+                                        <field name="phone"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                            <field name="nb_register"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                        </group>
+                                            <group col="8" colspan="4">
+                                                <separator string="" colspan="4"/>
+                                                <newline/>
+                                                <field name="state" colspan="2"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                     <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </footer>
-            </form>
+                </form>
             </field>
         </record>
 
@@ -351,15 +373,6 @@
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
-      <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
-            view_type="form"/>
-
       <act_window
             id="act_register_event_partner"
             name="Subscribe"
@@ -436,44 +449,40 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet string="Registration">
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
+                    <header>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                        <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                        <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </header>
+                    <sheet string="Registration">
+                        <label for="event_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                                 <field name="name"/>
-                                <field name="email"/>
                                 <field name="phone"/>
+                                <label for="email"/>
+                                <div>
+                                    <field name="email" class="oe_inline"/>
+                                    <button class="oe_inline oe_right" string="Send Email"
+                                      name="%(mail.action_email_compose_message_wizard)d"
+                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                </div>
                             </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
+                            <group>
+                                <field name="nb_register"/>
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                            </group>
+                            <group groups="base.group_no_one">
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
                             </group>
-                        </page>
-                        <page string="Emails">
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
+                        </group>
                     </sheet>
                     <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 8697f46d867..17472e0cc95 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -77,12 +77,10 @@ class report_event_registration(osv.osv):
                 r.state AS  registration_state
                 FROM
                 event_event e
-                
+
                 LEFT JOIN
                     event_registration r ON (e.id=r.event_id)
 
-                WHERE r.active = 'true'
-               
                GROUP BY
                 event_id,
                 user_id_registration,
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 93b9830ef82..12d8555b0ab 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
-                  <header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <footer>
                       <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                       or
                       <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </footer>
             </form>
             </field>
         </record>
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Emails']" position="after">
-                    <page string="Moodle">
-                        <field name="moodle_user_password" readonly='1' colspan="2"/>
-                        <field name="moodle_uid" readonly="1"/>
-                    </page>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="moodle_user_password" readonly='1'/>
+                    <field name="moodle_uid" readonly="1"/>
                 </xpath>
                 <field name="email" position="replace">
-                     <field name="email" required="1" />
+                     <!-- set the email as required -->
+                     <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
                      <field name="moodle_username" colspan="2" on_change="onchange_moodle_name(moodle_user_password)"/>
@@ -29,12 +28,12 @@
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
-                     <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
-                     <field name="name" required="1" />
+                   <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
+                   <field name="name" required="1" />
                 </xpath>
-                      <field name="email" position="replace">
-                          <field name="email" required="1" />
-                      </field>
+                <field name="email" position="replace">
+                    <field name="email" required="1" />
+                </field>
            </field>
         </record>
     </data>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index cfac9944d1b..b7ab7a55357 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
-                   <header>
-                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
-                       or
-                       <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
                        <field name="date_start"/>
                        <field name="date"/>
                    </group>
+                   <footer>
+                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
+                       or
+                       <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
               </form>
             </field>
         </record>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index acd9e622b01..ddbd4db7ee2 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
-                    <header>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
                         <field name="password" password="True"/>
                     </group>
+                    <footer>
+                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 44b533fdc52..aac2b0637ce 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -309,6 +309,10 @@ class res_users(osv.osv):
 
         return user_id
 
+    _columns = {
+        'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
+        }
+
 res_users()
 
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 3bf762b0f50..c9daaffbe4c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="month"/>
                     <field name="year"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index e4f6ec33bcb..554355edbb1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="init_date"/>
                     <field name="end_date"/>
                 </group>    
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 0657855c549..4e284cd396c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
                     <field name="end_date"/>
                     <field name="max_delay"/>
                 </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index acc1f5e01b0..96d924f88a7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
-                    <header>
-                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
-                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign in / Sign out"/>
                         <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
@@ -22,6 +16,12 @@
                     <field name="name" />
                     <field name="state" />
                     </group>
+                    <footer>
+                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
+                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 5be8871446a..fffdf76f0e9 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -8,14 +8,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
-                <header>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Send Evaluation Reminder">
                     <field name="evaluation_id"/>
                 </group>
+                <footer>
+                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
              </form>
         </field>
     </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index c5e408a6748..c0bbf741277 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
-                    <button string="Cancel" special="cancel" class="oe_link"/>
-                </header>
                 <group>
                     <field name="date_from" />
                     <field name="holiday_type"/>
                     <field name="depts"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" special="cancel" class="oe_link"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 4ef2dcc96c4..976d732ee69 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -20,6 +15,11 @@
                         <newline/>
                         <field name="emp" invisible="True"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 985f6b25eec..cf8a30c9847 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Partner" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    <footer>
                         <button name="make_order" string="Create Contact" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
                         <label string="or" groups="base.group_partner_manager"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index d14646b0249..afcf64808b7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employee Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
                         <field name="employee_id" colspan="3"/>
                     </group>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 288a51e34cd..8ead6ea63d6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -9,10 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employees Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <sheet>
                         <group>
                              <label for="month" string="Period"/>
@@ -25,6 +21,10 @@
                             <field name="employee_ids" nolabel="1"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c7b7f320c37..dc2a6c47b8d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
                         <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
                     </group>
+                    <footer>
+                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -26,11 +26,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -40,6 +35,11 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
+                    <footer>
+                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -60,12 +60,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
-                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -80,6 +74,12 @@
                         <field name="analytic_amount"/>
                     </group>
 
+                    <footer>
+                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
+                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 4e4eb7b36d2..f0679de8d95 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,27 +7,27 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit" version="7.0">
-                   <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
-                        <button special="cancel" string="Cancel" class="oe_link"/>
-                   </header>
+                <form string="Timesheet Profit" version="7.0">
                    <sheet>
                        <group> 
-                           <label for="date_from" string="Duration" />					
+                           <label for="date_from" string="Duration" />
                            <div>
- 						       <field name="date_from" nolabel="1" class="oe_inline" />
+                               <field name="date_from" nolabel="1" class="oe_inline" />
                                - <field name="date_to" nolabel="1" class="oe_inline"/>
                            </div>
                        </group>
                        <group>
                            <separator string="Journals" colspan="4"/>
-						   <field name="journal_ids" colspan="4" nolabel="1"/>
+                           <field name="journal_ids" colspan="4" nolabel="1"/>
                            <separator string="Users" colspan="4"/>
-						   <field name="employee_ids" colspan="4" nolabel="1"/>
-					   </group>
+                           <field name="employee_ids" colspan="4" nolabel="1"/>
+                       </group>
                    </sheet>
-			   </form>
+                   <footer>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                   </footer>
+               </form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 28e8662f010..85d9538cc5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -27,11 +27,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -39,6 +34,11 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
+                <footer>
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index aec0b52d5e6..1c163a1ac0e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <notebook>
                     <page string="Billing Data">
                        <group>
@@ -28,6 +23,11 @@
                        </group>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c04f116b48..b2dfabb310e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -7,14 +7,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
-               <header>
-                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-               </header>
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
+               <footer>
+                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+               </footer>
            </form>
         </field>
     </record>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9cee10c3cbb..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,11 +72,14 @@
                     <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
+                <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_ids"/>
-                    <h2><field name="category_ids"/></h2>
+                    <label for="category_ids" class="oe_edit_only"/>
+                    <field name="category_ids" widget="many2many_tags"/>
+                    <label for="description"/><newline/>
                     <field name="description"/>
+                </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>
                 </footer>
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index dad8acc1860..75e4f08b159 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_google
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 2968b009a51..b8adc71f2a5 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <newline/>
@@ -21,6 +16,11 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -33,14 +33,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index 811bd6016fb..6f67aed9ada 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-09 09:19+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-09 18:11+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -28,7 +28,7 @@ msgstr "エラー"
 #: view:import.sugarcrm:0
 msgid ""
 "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
+msgstr "SugarSoap API URL（ツールヒントを参照）とフルアクセスのSugarCRMログインを使用します。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -51,11 +51,12 @@ msgid ""
 "Choose data you want to import. Click 'Import' to get data manually or "
 "'Schedule Reccurent Imports' to get recurrently and automatically data."
 msgstr ""
+"インポートしたいデータを選択します。データを手動で取得するにはインポートを、データを繰り返し自動で取得するにはスケジュール反復インポートをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,contact:0
 msgid "Contacts"
-msgstr "連絡先"
+msgstr "コンタクト"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -65,12 +66,12 @@ msgstr "人事"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,bug:0
 msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
+msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,instance_name:0
 msgid "Instance's Name"
-msgstr "事例の名前"
+msgstr "インスタンスの名前"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
@@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
 msgid "Notify End Of Import To:"
-msgstr "へインポートの終了を通知する。"
+msgstr "インポート終了の通知先："
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,user:0
@@ -89,35 +90,37 @@ msgid ""
 "user with the same login exist in OpenERP, user information will be erase by "
 "sugarCRM user information"
 msgstr ""
+"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
+"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
 #, python-format
 msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "スケジュール反復インポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "Do not forget the email address to be notified of the success of the import."
-msgstr "インポート完了を通知するEメールを忘れないで下さい。"
+msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,call:0
 msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
+msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "If you make recurrent or ponctual import, data already  in OpenERP will be "
 "updated by SugarCRM data."
-msgstr ""
+msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
@@ -132,12 +135,12 @@ msgstr "ドキュメント"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータをインポートする。"
+msgstr "SugarCRMからデータのインポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -149,7 +152,7 @@ msgstr "CRM"
 msgid ""
 "Data are importing, the process is running in the background, an email will "
 "be sent to the given email address if it was defined."
-msgstr ""
+msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
@@ -159,19 +162,19 @@ msgstr "通話"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Multi Instance Management"
-msgstr ""
+msgstr "複数インスタンスの管理"
 
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr "_OK"
+msgstr "OK"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,opportunity:0
 msgid ""
 "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
 "and Opportunities"
-msgstr ""
+msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
@@ -186,6 +189,9 @@ msgid ""
 "application "
 "http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 msgstr ""
+"データを取得するためのWebサービスのURL。例：'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
+"CRMアプリケーションのアドレスをコピーします。 "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 
 #. module: import_sugarcrm
 #: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
@@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr "インポート(_I)"
+msgstr "インポート"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
@@ -208,18 +214,18 @@ msgstr "ユーザ"
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1131
 #, python-format
 msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
+msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,claim:0
 msgid "Cases"
-msgstr "お問合せ"
+msgstr "案件"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,meeting:0
 msgid ""
 "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
+msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,email_history:0
@@ -227,6 +233,7 @@ msgid ""
 "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
 "Messages and Attachments"
 msgstr ""
+"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project:0
@@ -240,13 +247,13 @@ msgid ""
 "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 msgstr ""
-"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from "
+"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project:0
 msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
+msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1098
@@ -263,12 +270,12 @@ msgstr "ミーティング"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,employee:0
 msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
+msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,url:0
 msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
+msgstr "SugarSoap API URL："
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -282,6 +289,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,bug:0
@@ -296,12 +305,12 @@ msgstr "プロジェクト"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project_task:0
 msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
+msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,opportunity:0
 msgid "Leads & Opp"
-msgstr "見込み客 ＆ 商談"
+msgstr "リード ＆ 商談"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -310,6 +319,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password or bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -330,12 +341,12 @@ msgstr "警告"
 msgid ""
 "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
 "from different server."
-msgstr ""
+msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス（接頭辞）は異なるサーバから来ます。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,contact:0
 msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
+msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,password:0
@@ -350,12 +361,12 @@ msgstr "ログイン情報"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,claim:0
 msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
+msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Notification When Import is Finished"
-msgstr ""
+msgstr "インポート完了時にEメール通知"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,username:0
@@ -366,17 +377,17 @@ msgstr "ユーザ名"
 #: view:import.message:0
 #: model:ir.model,name:import_sugarcrm.model_import_message
 msgid "Import Message"
-msgstr "メッセージをインポートする。"
+msgstr "メッセージのインポート"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,account:0
 msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
+msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Online documentation:"
-msgstr ""
+msgstr "オンラインドキュメンテーション："
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,account:0
@@ -386,7 +397,7 @@ msgstr "顧客情報"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Cancel"
-msgstr "キャンセル(_C)"
+msgstr "キャンセル"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
@@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Address to Notify"
-msgstr ""
+msgstr "通知のEメールアドレス"
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 357dc78c9d7..30ff9a9ed8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group string="Declare Periodical VAT">
                             <field name="period_id" widget="selection"/>
@@ -26,6 +21,11 @@
                     </group>
                     <separator string="Comments"/>
                     <field name="comments"/>
+                    <footer>
+                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d4bcd756922..f0bdb2a2a3f 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -8,12 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
-                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>
                     </group>   
@@ -33,6 +27,12 @@
                             <field name="country_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ed704810e45..222aad3b6b9 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
-                    <header>
-                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="file"/>
                     </group>
+                    <footer>
+                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 1340d869941..7e9d5894dfc 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
-                    <header>
-                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="dta_file"/>
                     </group>
+                    <footer>
+                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index 9d16f44252b..525dabfcc8a 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -8,135 +8,24 @@
         jusqu'à décembre 2007
 
         Version du fichier : 12-04-2008
+
+        Utilise les 'account types' de addons/account/data/data_account_type.xml
       -->
 
-        <!--  Account Types -->
-        <record id="account_type_dettes" model="account.account.type">
-            <field name="name">Dettes long terme</field>
-            <field name="code">dettes</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_immobilisations" model="account.account.type">
-            <field name="name">Immobilisations</field>
-            <field name="code">immobilization</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_stock" model="account.account.type">
-            <field name="name">Stocks</field>
-            <field name="code">stocks</field>
-            <field name="report_type">asset</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record id="account_type_cloture" model="account.account.type">
-            <field name="name">Cloture</field>
-            <field name="code">cloture</field>
-            <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_receivable" >
-              <field name="name">Receivable</field>
-              <field name="code">receivable</field>
-              <field name="report_type">asset</field>
-              <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_payable" >
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="report_type">liability</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_income" >
-          <field name="name">Income</field>
-          <field name="code">income</field>
-          <field name="report_type">income</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_expense">
-          <field name="name">Expense</field>
-          <field name="code">expense</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">none</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_tax">
-          <field name="name">Tax</field>
-          <field name="code">tax</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_cash">
-          <field name="name">Cash</field>
-          <field name="code">cash</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_asset">
-          <field name="name">Asset</field>
-          <field name="code">asset</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_equity">
-          <field name="name">Equity</field>
-          <field name="code">equity</field>
-          <field name="report_type">liability</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_provision">
-          <field name="name">Provisions</field>
-          <field name="code">provision</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_commitment">
-          <field name="name">Engagements</field>
-          <field name="code">commitment</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_stocks">
-          <field name="name">Actif circulant</field>
-          <field name="code">current asset</field>
-          <field name="report_type">asset</field>
-          <field name="close_method">balance</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_special">
-          <field name="name">Comptes spéciaux</field>
-          <field name="code">special</field>
-          <field name="close_method">none</field>
-        </record>
-
 
     <!-- Account Templates -->
     <record id="pcg_0" model="account.account.template">
       <field name="name">Plan Comptable Général</field>
       <field name="code">0</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
     </record>
 
     <record id="pcg_Classes_1_a_5" model="account.account.template">
       <field name="name">Comptes de bilan</field>
       <field name="code">Classes 1 à 5</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_0"/>
     </record>
 
@@ -144,9 +33,8 @@
       <field name="name">Comptes de capitaux</field>
       <field name="code">Classe 1</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Capitaux propres, autres fonds propres, emprunts et dettes assimilées</field>
-
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -154,8 +42,7 @@
       <field name="name">Capital et réserves</field>
       <field name="code">10</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -163,9 +50,8 @@
       <field name="name">Capital</field>
       <field name="code">101</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Capital pour sociétés de type (SARL, SA). Pour une EI utiliser le compte 108</field>
-
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -173,8 +59,7 @@
       <field name="name">Capital souscrit - non appelé</field>
       <field name="code">1011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -182,8 +67,7 @@
       <field name="name">Capital souscrit - appelé non versé</field>
       <field name="code">1012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -191,8 +75,7 @@
       <field name="name">Capital souscrit - appelé versé</field>
       <field name="code">1013</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -200,8 +83,7 @@
       <field name="name">Capital non amorti</field>
       <field name="code">10131</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1013"/>
     </record>
 
@@ -209,8 +91,7 @@
       <field name="name">Capital amorti</field>
       <field name="code">10132</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1013"/>
     </record>
 
@@ -218,8 +99,7 @@
       <field name="name">Capital souscrit soumis à des réglementations particulières</field>
       <field name="code">1018</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_101"/>
     </record>
 
@@ -227,8 +107,7 @@
       <field name="name">Primes liées au capital social</field>
       <field name="code">104</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -236,8 +115,7 @@
       <field name="name">Primes d'émission</field>
       <field name="code">1041</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -245,8 +123,7 @@
       <field name="name">Primes de fusion</field>
       <field name="code">1042</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -254,8 +131,7 @@
       <field name="name">Primes d'apport</field>
       <field name="code">1043</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -263,8 +139,7 @@
       <field name="name">Primes de conversion d'obligations en actions</field>
       <field name="code">1044</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -272,8 +147,7 @@
       <field name="name">Bons de souscription d'actions</field>
       <field name="code">1045</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_104"/>
     </record>
 
@@ -281,8 +155,7 @@
       <field name="name">Écarts de réévaluation</field>
       <field name="code">105</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -290,8 +163,7 @@
       <field name="name">Réserve spéciale de réévaluation</field>
       <field name="code">1051</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -299,8 +171,7 @@
       <field name="name">Écart de réévaluation libre</field>
       <field name="code">1052</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -308,8 +179,7 @@
       <field name="name">Réserve de réévaluation</field>
       <field name="code">1053</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -317,8 +187,7 @@
       <field name="name">Écarts de réévaluation (autres opérations légales)</field>
       <field name="code">1055</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -326,8 +195,7 @@
       <field name="name">Autres écarts de réévaluation en France</field>
       <field name="code">1057</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -335,8 +203,7 @@
       <field name="name">Autres écarts de réévaluation à l'étranger</field>
       <field name="code">1058</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_105"/>
     </record>
 
@@ -344,8 +211,7 @@
       <field name="name">Réserves</field>
       <field name="code">106</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -353,8 +219,7 @@
       <field name="name">Réserve légale</field>
       <field name="code">1061</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -362,8 +227,7 @@
       <field name="name">Réserve légale proprement dite</field>
       <field name="code">10611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1061"/>
     </record>
 
@@ -371,8 +235,7 @@
       <field name="name">Plus-values nettes à long terme</field>
       <field name="code">10612</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1061"/>
     </record>
 
@@ -380,8 +243,7 @@
       <field name="name">Réserves indisponibles</field>
       <field name="code">1062</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -389,8 +251,7 @@
       <field name="name">Réserves statutaires ou contractuelles</field>
       <field name="code">1063</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -398,8 +259,7 @@
       <field name="name">Réserves réglementées</field>
       <field name="code">1064</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -407,8 +267,7 @@
       <field name="name">Plus-values nettes à long terme</field>
       <field name="code">10641</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -416,8 +275,7 @@
       <field name="name">Réserves consécutives à l'octroi de subventions d'investissement</field>
       <field name="code">10643</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -425,8 +283,7 @@
       <field name="name">Autres réserves réglementées</field>
       <field name="code">10648</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1064"/>
     </record>
 
@@ -434,8 +291,7 @@
       <field name="name">Autres réserves</field>
       <field name="code">1068</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_106"/>
     </record>
 
@@ -443,8 +299,7 @@
       <field name="name">Réserve de propre assureur</field>
       <field name="code">10681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1068"/>
     </record>
 
@@ -452,8 +307,7 @@
       <field name="name">Réserves diverses</field>
       <field name="code">10688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1068"/>
     </record>
 
@@ -461,8 +315,7 @@
       <field name="name">Écarts d'équivalence</field>
       <field name="code">107</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -470,9 +323,8 @@
       <field name="name">Compte de l'exploitant</field>
       <field name="code">108</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="note">Capital pour une Entreprise Individuelle</field>
-
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -480,8 +332,7 @@
       <field name="name">Actionnaires: capital souscrit - non appelé</field>
       <field name="code">109</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_asset"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_10"/>
     </record>
 
@@ -489,8 +340,7 @@
       <field name="name">Report à nouveau (solde créditeur ou débiteur)</field>
       <field name="code">11</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -498,8 +348,7 @@
       <field name="name">Report à nouveau (solde créditeur)</field>
       <field name="code">110</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_11"/>
     </record>
 
@@ -507,8 +356,7 @@
       <field name="name">Report à nouveau (solde débiteur)</field>
       <field name="code">119</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_11"/>
     </record>
 
@@ -516,8 +364,7 @@
       <field name="name">Résultat de l'exercice (bénéfice ou perte)</field>
       <field name="code">12</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -525,8 +372,7 @@
       <field name="name">Résultat de l'exercice (bénéfice)</field>
       <field name="code">120</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_12"/>
     </record>
 
@@ -534,8 +380,7 @@
       <field name="name">Résultat de l'exercice (perte)</field>
       <field name="code">129</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_12"/>
     </record>
 
@@ -543,8 +388,7 @@
       <field name="name">Subventions d'investissement</field>
       <field name="code">13</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -552,8 +396,7 @@
       <field name="name">Subventions d'équipement</field>
       <field name="code">131</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -561,8 +404,7 @@
       <field name="name">État</field>
       <field name="code">1311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -570,8 +412,7 @@
       <field name="name">Régions</field>
       <field name="code">1312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -579,8 +420,7 @@
       <field name="name">Départements</field>
       <field name="code">1313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -588,8 +428,7 @@
       <field name="name">Communes</field>
       <field name="code">1314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -597,8 +436,7 @@
       <field name="name">Collectivités publiques</field>
       <field name="code">1315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -606,8 +444,7 @@
       <field name="name">Entreprises publiques</field>
       <field name="code">1316</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -615,8 +452,7 @@
       <field name="name">Entreprises et organismes privés</field>
       <field name="code">1317</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -624,8 +460,7 @@
       <field name="name">Autres</field>
       <field name="code">1318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_131"/>
     </record>
 
@@ -633,8 +468,7 @@
       <field name="name">Autres subventions d'investissement (même ventilation que celle du compte 131)</field>
       <field name="code">138</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -642,8 +476,7 @@
       <field name="name">Subventions d'investissement inscrites au compte de résultat</field>
       <field name="code">139</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_13"/>
     </record>
 
@@ -651,8 +484,7 @@
       <field name="name">Subventions d'équipement</field>
       <field name="code">1391</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_139"/>
     </record>
 
@@ -660,8 +492,7 @@
       <field name="name">Etat</field>
       <field name="code">13911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -669,8 +500,7 @@
       <field name="name">Régions</field>
       <field name="code">13912</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -678,8 +508,7 @@
       <field name="name">Départements</field>
       <field name="code">13913</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -687,8 +516,7 @@
       <field name="name">Communes</field>
       <field name="code">13914</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -696,8 +524,7 @@
       <field name="name">Collectivités publiques</field>
       <field name="code">13915</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -705,8 +532,7 @@
       <field name="name">Entreprises publiques</field>
       <field name="code">13916</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -714,8 +540,7 @@
       <field name="name">Entreprises et organismes privés </field>
       <field name="code">13917</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -723,8 +548,7 @@
       <field name="name">Autres</field>
       <field name="code">13918</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1391"/>
     </record>
 
@@ -732,8 +556,7 @@
       <field name="name">Autres subventions d'investissement (même ventilation que celle du compte 1391)</field>
       <field name="code">1398</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_139"/>
     </record>
 
@@ -741,8 +564,7 @@
       <field name="name">Provisions réglementées</field>
       <field name="code">14</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -750,8 +572,7 @@
       <field name="name">Provisions réglementées relatives aux immobilisations</field>
       <field name="code">142</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -759,8 +580,7 @@
       <field name="name">Provisions reconstitution des gisements miniers et pétroliers</field>
       <field name="code">1423</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_142"/>
     </record>
 
@@ -768,8 +588,7 @@
       <field name="name">Provisions pour investissement (participation des salariés)</field>
       <field name="code">1424</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_142"/>
     </record>
 
@@ -777,8 +596,7 @@
       <field name="name">Provisions réglementées relatives aux stocks</field>
       <field name="code">143</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -786,8 +604,7 @@
       <field name="name">Hausse des prix</field>
       <field name="code">1431</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_143"/>
     </record>
 
@@ -795,8 +612,7 @@
       <field name="name">Fluctuation des cours</field>
       <field name="code">1432</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_143"/>
     </record>
 
@@ -804,8 +620,7 @@
       <field name="name">Provisions réglementées relatives aux autres éléments de l'actif</field>
       <field name="code">144</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -813,8 +628,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">145</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -822,8 +636,7 @@
       <field name="name">Provision spéciale de réévaluation</field>
       <field name="code">146</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -831,8 +644,7 @@
       <field name="name">Plus-values réinvesties</field>
       <field name="code">147</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -840,8 +652,7 @@
       <field name="name">Autres provisions réglementées</field>
       <field name="code">148</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_equity"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_14"/>
     </record>
 
@@ -849,8 +660,7 @@
       <field name="name">Provisions</field>
       <field name="code">15</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -858,8 +668,7 @@
       <field name="name">Provisions pour risques</field>
       <field name="code">151</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -867,8 +676,7 @@
       <field name="name">Provisions pour litiges</field>
       <field name="code">1511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -876,8 +684,7 @@
       <field name="name">Provisions pour garanties données aux clients</field>
       <field name="code">1512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -885,8 +692,7 @@
       <field name="name">Provisions pour pertes sur marchés à terme</field>
       <field name="code">1513</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -894,8 +700,7 @@
       <field name="name">Provisions pour amendes et pénalités</field>
       <field name="code">1514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -903,8 +708,7 @@
       <field name="name">Provisions pour pertes de change</field>
       <field name="code">1515</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -912,8 +716,7 @@
       <field name="name">Provisions pour pertes sur contrats</field>
       <field name="code">1516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -921,8 +724,7 @@
       <field name="name">Autres provisions pour risques</field>
       <field name="code">1518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_151"/>
     </record>
 
@@ -930,8 +732,7 @@
       <field name="name">Provisions pour pensions et obligations similaires</field>
       <field name="code">153</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -939,8 +740,7 @@
       <field name="name">Provisions pour restructurations</field>
       <field name="code">154</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -948,8 +748,7 @@
       <field name="name">Provisions pour impôts</field>
       <field name="code">155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -957,8 +756,7 @@
       <field name="name">Provisions pour renouvellement des immobilisations (entreprises concessionnaires)</field>
       <field name="code">156</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -966,8 +764,7 @@
       <field name="name">Provisions pour charges à répartir sur plusieurs exercices</field>
       <field name="code">157</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -975,8 +772,7 @@
       <field name="name">Provisions pour gros entretien ou grandes révisions </field>
       <field name="code">1572</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_157"/>
     </record>
 
@@ -984,8 +780,7 @@
       <field name="name">Autres provisions pour charges</field>
       <field name="code">158</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_15"/>
     </record>
 
@@ -993,8 +788,7 @@
       <field name="name">Provisions pour remises en état</field>
       <field name="code">1581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_provision"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_158"/>
     </record>
 
@@ -1002,8 +796,7 @@
       <field name="name">Emprunts et dettes assimilées</field>
       <field name="code">16</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1011,8 +804,7 @@
       <field name="name">Emprunts obligataires convertibles</field>
       <field name="code">161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1020,8 +812,7 @@
       <field name="name">Autres emprunts obligataires </field>
       <field name="code">163</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1029,8 +820,7 @@
       <field name="name">Emprunts auprès des établissements de crédit</field>
       <field name="code">164</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1038,8 +828,7 @@
       <field name="name">Dépôts et cautionnements reçus</field>
       <field name="code">165</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1047,8 +836,7 @@
       <field name="name">Dépôts</field>
       <field name="code">1651</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_165"/>
     </record>
 
@@ -1056,8 +844,7 @@
       <field name="name">Cautionnements</field>
       <field name="code">1655</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_165"/>
     </record>
 
@@ -1065,8 +852,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">166</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1074,8 +860,7 @@
       <field name="name">Comptes bloqués</field>
       <field name="code">1661</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_166"/>
     </record>
 
@@ -1083,8 +868,7 @@
       <field name="name">Fonds de participation</field>
       <field name="code">1662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_166"/>
     </record>
 
@@ -1092,8 +876,7 @@
       <field name="name">Emprunts et dettes assortis de conditions particulières</field>
       <field name="code">167</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1101,8 +884,7 @@
       <field name="name">Emissions de titres participatifs</field>
       <field name="code">1671</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1110,8 +892,7 @@
       <field name="name">Avances conditionnées de l'État</field>
       <field name="code">1674</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1119,8 +900,7 @@
       <field name="name">Emprunts participatifs</field>
       <field name="code">1675</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_167"/>
     </record>
 
@@ -1128,8 +908,7 @@
       <field name="name">Autres emprunts et dettes assimilées</field>
       <field name="code">168</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1137,8 +916,7 @@
       <field name="name">Autres emprunts</field>
       <field name="code">1681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1146,8 +924,7 @@
       <field name="name">Rentes viagères capitalisées</field>
       <field name="code">1685</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1155,8 +932,7 @@
       <field name="name">Autres dettes</field>
       <field name="code">1687</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1164,8 +940,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">1688</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_168"/>
     </record>
 
@@ -1173,8 +948,7 @@
       <field name="name">Sur emprunts obligataires convertibles </field>
       <field name="code">16881</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1182,8 +956,7 @@
       <field name="name">Sur autres emprunts obligataires</field>
       <field name="code">16883</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1191,8 +964,7 @@
       <field name="name">Sur emprunts auprès des établissements de crédit</field>
       <field name="code">16884</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1200,8 +972,7 @@
       <field name="name">Sur dépôts et cautionnements reçus</field>
       <field name="code">16885</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1209,8 +980,7 @@
       <field name="name">Sur participation des salariés aux résultats</field>
       <field name="code">16886</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1218,8 +988,7 @@
       <field name="name">Sur emprunts et dettes assortis de conditions particulières</field>
       <field name="code">16887</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1227,8 +996,7 @@
       <field name="name">Sur autres emprunts et dettes assimilées</field>
       <field name="code">16888</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_1688"/>
     </record>
 
@@ -1236,8 +1004,7 @@
       <field name="name">Primes de remboursement des obligations</field>
       <field name="code">169</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_16"/>
     </record>
 
@@ -1245,8 +1012,7 @@
       <field name="name">Dettes rattachées à des participations</field>
       <field name="code">17</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1254,8 +1020,7 @@
       <field name="name">Dettes rattachées à des participations (groupe)</field>
       <field name="code">171</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1263,8 +1028,7 @@
       <field name="name">Dettes rattachées à des participations (hors groupe)</field>
       <field name="code">174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1272,8 +1036,7 @@
       <field name="name">Dettes rattachées à des sociétés en participation</field>
       <field name="code">178</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_17"/>
     </record>
 
@@ -1281,8 +1044,7 @@
       <field name="name">Principal</field>
       <field name="code">1781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_178"/>
     </record>
 
@@ -1290,8 +1052,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">1788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_178"/>
     </record>
 
@@ -1299,8 +1060,7 @@
       <field name="name">Comptes de liaison des établissements et sociétés en participation</field>
       <field name="code">18</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_1"/>
     </record>
 
@@ -1308,8 +1068,7 @@
       <field name="name">Comptes de liaison des établissements</field>
       <field name="code">181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1317,8 +1076,7 @@
       <field name="name">Biens et prestations de services échangés entre établissements (charges)</field>
       <field name="code">186</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1326,8 +1084,7 @@
       <field name="name">Biens et prestations de services échangés entre établissements (produits)</field>
       <field name="code">187</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1335,8 +1092,7 @@
       <field name="name">Comptes de liaison des sociétés en participation</field>
       <field name="code">188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_18"/>
     </record>
 
@@ -1344,9 +1100,8 @@
       <field name="name">Comptes d'immobilisations</field>
       <field name="code">Classe 2</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Immobilisations incorporelles, corporelles, financières et frais d'établissement</field>
-
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -1354,8 +1109,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">20</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1363,8 +1117,7 @@
       <field name="name">Frais d'établissement</field>
       <field name="code">201</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1372,8 +1125,7 @@
       <field name="name">Frais de constitution</field>
       <field name="code">2011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1381,8 +1133,7 @@
       <field name="name">Frais de premier établissement</field>
       <field name="code">2012</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1390,8 +1141,7 @@
       <field name="name">Frais de prospection</field>
       <field name="code">20121</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2012"/>
     </record>
 
@@ -1399,8 +1149,7 @@
       <field name="name">Frais de publicité</field>
       <field name="code">20122</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2012"/>
     </record>
 
@@ -1408,8 +1157,7 @@
       <field name="name">Frais d'augmentation de capital et d'opérations diverses (fusions, scissions, transformations)</field>
       <field name="code">2013</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_201"/>
     </record>
 
@@ -1417,8 +1165,7 @@
       <field name="name">Frais de recherche et de développement</field>
       <field name="code">203</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1426,8 +1173,7 @@
       <field name="name">Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">205</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1435,8 +1181,7 @@
       <field name="name">Droit au bail</field>
       <field name="code">206</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1444,8 +1189,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">207</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1453,8 +1197,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">208</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_20"/>
     </record>
 
@@ -1462,9 +1205,8 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">21</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Si valeur unitaire supérieure à 500 Euros HT</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1472,8 +1214,7 @@
       <field name="name">Terrains</field>
       <field name="code">211</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1481,8 +1222,7 @@
       <field name="name">Terrains nus</field>
       <field name="code">2111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1490,8 +1230,7 @@
       <field name="name">Terrains aménagés</field>
       <field name="code">2112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1499,8 +1238,7 @@
       <field name="name">Sous-sols et sur-sols</field>
       <field name="code">2113</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1508,8 +1246,7 @@
       <field name="name">Terrains de gisement</field>
       <field name="code">2114</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1517,8 +1254,7 @@
       <field name="name">Carrières</field>
       <field name="code">21141</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2114"/>
     </record>
 
@@ -1526,8 +1262,7 @@
       <field name="name">Terrains bâtis</field>
       <field name="code">2115</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1535,8 +1270,7 @@
       <field name="name">Ensembles immobiliers industriels (A, B, ...)</field>
       <field name="code">21151</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1544,8 +1278,7 @@
       <field name="name">Ensembles immobiliers administratifs et commerciaux (A, B, ...)</field>
       <field name="code">21155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1553,8 +1286,7 @@
       <field name="name">Autres ensembles immobiliers</field>
       <field name="code">21158</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_2115"/>
     </record>
 
@@ -1562,8 +1294,7 @@
       <field name="name">Affectés aux opérations professionnelles (A, B, ...)</field>
       <field name="code">211581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21158"/>
     </record>
 
@@ -1571,8 +1302,7 @@
       <field name="name">Affectés aux opérations non professionnelles (A, B, ...)</field>
       <field name="code">211588</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21158"/>
     </record>
 
@@ -1580,8 +1310,7 @@
       <field name="name">Compte d'ordre sur immobilisations</field>
       <field name="code">2116</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_211"/>
     </record>
 
@@ -1589,8 +1318,7 @@
       <field name="name">Agencements et aménagements de terrains (même ventilation que celle du compte 211)</field>
       <field name="code">212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1598,8 +1326,7 @@
       <field name="name">Constructions</field>
       <field name="code">213</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1607,8 +1334,7 @@
       <field name="name">Bâtiments</field>
       <field name="code">2131</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1616,8 +1342,7 @@
       <field name="name">Ensembles immobiliers industriels (A, B, ...)</field>
       <field name="code">21311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1625,8 +1350,7 @@
       <field name="name">Ensembles immobiliers administratifs et commerciaux (A, B, ...)</field>
       <field name="code">21315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1634,8 +1358,7 @@
       <field name="name">Autres ensembles immobiliers</field>
       <field name="code">21318</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_2131"/>
     </record>
 
@@ -1643,8 +1366,7 @@
       <field name="name">Affectés aux opérations professionnelles (A, B, ...)</field>
       <field name="code">213181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21318"/>
     </record>
 
@@ -1652,8 +1374,7 @@
       <field name="name">Affectés aux opérations non professionnelles (A, B, ...)</field>
       <field name="code">213188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21318"/>
     </record>
 
@@ -1661,8 +1382,7 @@
       <field name="name">Installations générales agencements aménagements des constructions (même ventilation que celle du compte 2131)</field>
       <field name="code">2135</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1670,8 +1390,7 @@
       <field name="name">Ouvrages d'infrastructure</field>
       <field name="code">2138</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_213"/>
     </record>
 
@@ -1679,8 +1398,7 @@
       <field name="name">Voies de terre</field>
       <field name="code">21381</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1688,8 +1406,7 @@
       <field name="name">Voies de fer</field>
       <field name="code">21382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1697,8 +1414,7 @@
       <field name="name">Voies d'eau</field>
       <field name="code">21383</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1706,8 +1422,7 @@
       <field name="name">Barrages</field>
       <field name="code">21384</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1715,8 +1430,7 @@
       <field name="name">Pistes d'aérodromes</field>
       <field name="code">21385</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2138"/>
     </record>
 
@@ -1724,8 +1438,7 @@
       <field name="name">Constructions sur sol d'autrui (même ventilation que celle du compte 213)</field>
       <field name="code">214</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1733,8 +1446,7 @@
       <field name="name">Installations techniques matériels et outillages industriels</field>
       <field name="code">215</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1742,8 +1454,7 @@
       <field name="name">Installations complexes spécialisées</field>
       <field name="code">2151</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1751,8 +1462,7 @@
       <field name="name">Sur sol propre</field>
       <field name="code">21511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2151"/>
     </record>
 
@@ -1760,8 +1470,7 @@
       <field name="name">Sur sol d'autrui</field>
       <field name="code">21514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2151"/>
     </record>
 
@@ -1769,8 +1478,7 @@
       <field name="name">Installations à caractère spécifique</field>
       <field name="code">2153</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1778,8 +1486,7 @@
       <field name="name">Sur sol propre</field>
       <field name="code">21531</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2153"/>
     </record>
 
@@ -1787,8 +1494,7 @@
       <field name="name">Sur sol d'autrui</field>
       <field name="code">21534</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2153"/>
     </record>
 
@@ -1796,8 +1502,7 @@
       <field name="name">Matériel industriel</field>
       <field name="code">2154</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1805,8 +1510,7 @@
       <field name="name">Outillage industriel</field>
       <field name="code">2155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1814,8 +1518,7 @@
       <field name="name">Agencements et aménagements du matériel et outillage industriels</field>
       <field name="code">2157</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_215"/>
     </record>
 
@@ -1823,8 +1526,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">218</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_21"/>
     </record>
 
@@ -1832,8 +1534,7 @@
       <field name="name">Installations générales agencements aménagements divers</field>
       <field name="code">2181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1841,8 +1542,7 @@
       <field name="name">Matériel de transport</field>
       <field name="code">2182</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1850,8 +1550,7 @@
       <field name="name">Matériel de bureau et matériel informatique </field>
       <field name="code">2183</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1859,8 +1558,7 @@
       <field name="name">Mobilier</field>
       <field name="code">2184</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1868,8 +1566,7 @@
       <field name="name">Cheptel</field>
       <field name="code">2185</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1877,8 +1574,7 @@
       <field name="name">Emballages récupérables</field>
       <field name="code">2186</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_218"/>
     </record>
 
@@ -1886,8 +1582,7 @@
       <field name="name">Immobilisations mises en concession</field>
       <field name="code">22</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1895,8 +1590,7 @@
       <field name="name">Immobilisations en cours</field>
       <field name="code">23</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -1904,8 +1598,7 @@
       <field name="name">Immobilisations corporelles en cours</field>
       <field name="code">231</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1913,9 +1606,8 @@
       <field name="name">Terrains</field>
       <field name="code">2312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les terrains</field>
-
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1923,8 +1615,7 @@
       <field name="name">Constructions</field>
       <field name="code">2313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1932,8 +1623,7 @@
       <field name="name">Installations techniques matériel et outillage industriels</field>
       <field name="code">2315</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1941,8 +1631,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">2318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_231"/>
     </record>
 
@@ -1950,8 +1639,7 @@
       <field name="name">Immobilisations incorporelles en cours </field>
       <field name="code">232</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1959,8 +1647,7 @@
       <field name="name">Avances et acomptes versés sur commandes d'immobilisations incorporelles</field>
       <field name="code">237</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1968,8 +1655,7 @@
       <field name="name">Avances et acomptes versés sur commandes d'immobilisations corporelles</field>
       <field name="code">238</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_23"/>
     </record>
 
@@ -1977,8 +1663,7 @@
       <field name="name">Terrains</field>
       <field name="code">2382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -1986,8 +1671,7 @@
       <field name="name">Constructions</field>
       <field name="code">2383</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -1995,8 +1679,7 @@
       <field name="name">Installations techniques matériel et outillage industriels</field>
       <field name="code">2385</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -2004,8 +1687,7 @@
       <field name="name">Autres immobilisations corporelles</field>
       <field name="code">2388</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_238"/>
     </record>
 
@@ -2013,8 +1695,7 @@
       <field name="name">Parts dans des entreprises liées et créances dans des entreprises liées</field>
       <field name="code">25</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2022,8 +1703,7 @@
       <field name="name">Participations et créances rattachées à des participations</field>
       <field name="code">26</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2031,9 +1711,8 @@
       <field name="name">Titres de participation</field>
       <field name="code">261</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pas d'amortissement sur les titres de participation</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2041,8 +1720,7 @@
       <field name="name">Actions</field>
       <field name="code">2611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_261"/>
     </record>
 
@@ -2050,8 +1728,7 @@
       <field name="name">Autres titres</field>
       <field name="code">2618</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_261"/>
     </record>
 
@@ -2059,9 +1736,8 @@
       <field name="name">Titres évalués par équivalence</field>
       <field name="code">262</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les titres évalués par équivalence</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2069,9 +1745,8 @@
       <field name="name">Autres formes de participation</field>
       <field name="code">266</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Pas d'amortissement sur les titres évalués par équivalence</field>
-
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2079,8 +1754,7 @@
       <field name="name">Créances rattachées à des participations</field>
       <field name="code">267</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2088,8 +1762,7 @@
       <field name="name">Créances rattachées à des participations (groupe)</field>
       <field name="code">2671</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2097,8 +1770,7 @@
       <field name="name">Créances rattachées à des participations (hors groupe)</field>
       <field name="code">2674</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2106,8 +1778,7 @@
       <field name="name">Versements représentatifs d'apports non capitalisés (appel de fonds)</field>
       <field name="code">2675</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2115,8 +1786,7 @@
       <field name="name">Avances consolidables</field>
       <field name="code">2676</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2124,8 +1794,7 @@
       <field name="name">Autres créances rattachées à des participations </field>
       <field name="code">2677</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2133,8 +1802,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2678</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_267"/>
     </record>
 
@@ -2142,8 +1810,7 @@
       <field name="name">Créances rattachées à des sociétés en participation</field>
       <field name="code">268</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2151,8 +1818,7 @@
       <field name="name">Principal</field>
       <field name="code">2681</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_268"/>
     </record>
 
@@ -2160,8 +1826,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_268"/>
     </record>
 
@@ -2169,8 +1834,7 @@
       <field name="name">Versements restant à effectuer sur titres de participation non libérés</field>
       <field name="code">269</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_26"/>
     </record>
 
@@ -2178,9 +1842,8 @@
       <field name="name">Autres immobilisations financières</field>
       <field name="code">27</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pas d'amortissement sur les immobilisations financières</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2188,8 +1851,7 @@
       <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille (droit de propriété)</field>
       <field name="code">271</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2197,8 +1859,7 @@
       <field name="name">Actions</field>
       <field name="code">2711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_271"/>
     </record>
 
@@ -2206,8 +1867,7 @@
       <field name="name">Autres titres</field>
       <field name="code">2718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_271"/>
     </record>
 
@@ -2215,8 +1875,7 @@
       <field name="name">Titres immobilisés (droit de créance)</field>
       <field name="code">272</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2224,8 +1883,7 @@
       <field name="name">Obligations</field>
       <field name="code">2721</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_272"/>
     </record>
 
@@ -2233,8 +1891,7 @@
       <field name="name">Bons</field>
       <field name="code">2722</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_272"/>
     </record>
 
@@ -2242,8 +1899,7 @@
       <field name="name">Titres immobilisés de l'activité de portefeuille (TIAP)</field>
       <field name="code">273</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2251,8 +1907,7 @@
       <field name="name">Prêts</field>
       <field name="code">274</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2260,8 +1915,7 @@
       <field name="name">Prêts participatifs</field>
       <field name="code">2741</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2269,8 +1923,7 @@
       <field name="name">Prêts aux associés</field>
       <field name="code">2742</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2278,8 +1931,7 @@
       <field name="name">Prêts au personnel</field>
       <field name="code">2743</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2287,8 +1939,7 @@
       <field name="name">Autres prêts</field>
       <field name="code">2748</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_274"/>
     </record>
 
@@ -2296,9 +1947,7 @@
       <field name="name">Dépôts et cautionnements versés</field>
       <field name="code">275</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-      <field name="note">ex : badge autoroute..</field>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2306,8 +1955,7 @@
       <field name="name">Dépôts</field>
       <field name="code">2751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_275"/>
     </record>
 
@@ -2315,8 +1963,7 @@
       <field name="name">Cautionnements</field>
       <field name="code">2755</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_275"/>
     </record>
 
@@ -2324,8 +1971,7 @@
       <field name="name">Autres créances immobilisées</field>
       <field name="code">276</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2333,8 +1979,7 @@
       <field name="name">Créances diverses</field>
       <field name="code">2761</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_276"/>
     </record>
 
@@ -2342,8 +1987,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">2768</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_276"/>
     </record>
 
@@ -2351,8 +1995,7 @@
       <field name="name">Sur titres immobilisés (droits de créance)</field>
       <field name="code">27682</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2360,8 +2003,7 @@
       <field name="name">Sur prêts</field>
       <field name="code">27684</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2369,8 +2011,7 @@
       <field name="name">Sur dépôts et cautionnements</field>
       <field name="code">27685</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2378,8 +2019,7 @@
       <field name="name">Sur créances diverses</field>
       <field name="code">27688</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_2768"/>
     </record>
 
@@ -2387,8 +2027,7 @@
       <field name="name">Actions propres ou parts propres</field>
       <field name="code">277</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2396,8 +2035,7 @@
       <field name="name">Actions propres ou parts propres</field>
       <field name="code">2771</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_277"/>
     </record>
 
@@ -2405,8 +2043,7 @@
       <field name="name">Actions propres ou parts propres en voie d'annulation</field>
       <field name="code">2772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_277"/>
     </record>
 
@@ -2414,8 +2051,7 @@
       <field name="name">Versements restant à effectuer sur titres immobilisés non libérés</field>
       <field name="code">279</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_27"/>
     </record>
 
@@ -2423,9 +2059,8 @@
       <field name="name">Amortissement des immobilisations</field>
       <field name="code">28</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">http://fr.wikipedia.org/wiki/Amortissement_comptable</field>
-
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2433,8 +2068,7 @@
       <field name="name">Amortissements des immobilisations incorporelles</field>
       <field name="code">280</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2442,8 +2076,7 @@
       <field name="name">Frais d'établissement (même ventilation que celle du compte 201) </field>
       <field name="code">2801</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2451,8 +2084,7 @@
       <field name="name">Frais de recherche et de développement </field>
       <field name="code">2803</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2460,8 +2092,7 @@
       <field name="name">Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires</field>
       <field name="code">2805</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2469,8 +2100,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">2807</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2478,8 +2108,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">2808</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_280"/>
     </record>
 
@@ -2487,8 +2116,7 @@
       <field name="name">Amortissements des immobilisations corporelles</field>
       <field name="code">281</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2496,8 +2124,7 @@
       <field name="name">Terrains de gisement</field>
       <field name="code">2811</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2505,8 +2132,7 @@
       <field name="name">Agencements aménagements de terrains (même ventilation que celle du compte 212)</field>
       <field name="code">2812</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2514,8 +2140,7 @@
       <field name="name">Constructions (même ventilation que celle du compte 213)</field>
       <field name="code">2813</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2523,8 +2148,7 @@
       <field name="name">Constructions sur sol d'autrui (même ventilation que celle du compte 214)</field>
       <field name="code">2814</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2532,8 +2156,7 @@
       <field name="name">Installations matériel et outillage industriels (même ventilation que celle du compte 215)</field>
       <field name="code">2815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2541,8 +2164,7 @@
       <field name="name">Autres immobilisations corporelles (même ventilation que celle du compte 218)</field>
       <field name="code">2818</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_281"/>
     </record>
 
@@ -2550,8 +2172,7 @@
       <field name="name">Amortissements des immobilisations mises en concession</field>
       <field name="code">282</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_28"/>
     </record>
 
@@ -2559,8 +2180,7 @@
       <field name="name">Dépréciation des immobilisations</field>
       <field name="code">29</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_2"/>
     </record>
 
@@ -2568,8 +2188,7 @@
       <field name="name">Dépréciations des immobilisations incorporelles</field>
       <field name="code">290</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2577,8 +2196,7 @@
       <field name="name">Marques, procédés, droits et valeurs similaires</field>
       <field name="code">2905</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2586,8 +2204,7 @@
       <field name="name">Droit au bail</field>
       <field name="code">2906</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2595,8 +2212,7 @@
       <field name="name">Fonds commercial</field>
       <field name="code">2907</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2604,8 +2220,7 @@
       <field name="name">Autres immobilisations incorporelles</field>
       <field name="code">2908</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_290"/>
     </record>
 
@@ -2613,8 +2228,7 @@
       <field name="name">Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)</field>
       <field name="code">291</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2622,8 +2236,7 @@
       <field name="name">Terrains (autres que terrains de gisement)</field>
       <field name="code">2911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_291"/>
     </record>
 
@@ -2631,8 +2244,7 @@
       <field name="name">Dépréciations des immobilisations mises en concession</field>
       <field name="code">292</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2640,8 +2252,7 @@
       <field name="name">Dépréciations des immobilisations en cours</field>
       <field name="code">293</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2649,8 +2260,7 @@
       <field name="name">Immobilisations corporelles en cours</field>
       <field name="code">2931</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_293"/>
     </record>
 
@@ -2658,8 +2268,7 @@
       <field name="name">Immobilisations incorporelles en cours</field>
       <field name="code">2932</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_293"/>
     </record>
 
@@ -2667,8 +2276,7 @@
       <field name="name">Provisions pour dépréciation des participations et créances rattachées à des participations</field>
       <field name="code">296</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2676,8 +2284,7 @@
       <field name="name">Titres de participation</field>
       <field name="code">2961</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2685,8 +2292,7 @@
       <field name="name">Autres formes de participation</field>
       <field name="code">2966</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2694,8 +2300,7 @@
       <field name="name">Créances rattachées à des participations (même ventilation que celle du compte 267)</field>
       <field name="code">2967</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2703,8 +2308,7 @@
       <field name="name">Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)</field>
       <field name="code">2968</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_296"/>
     </record>
 
@@ -2712,8 +2316,7 @@
       <field name="name">Dépréciations des autres immobilisations financières</field>
       <field name="code">297</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_29"/>
     </record>
 
@@ -2721,8 +2324,7 @@
       <field name="name">Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille - droit de propriété (ventilation : 271)</field>
       <field name="code">2971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2730,8 +2332,7 @@
       <field name="name">Titres immobilisés - droit de créance (même ventilation que celle du compte 272) </field>
       <field name="code">2972</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2739,16 +2340,14 @@
       <field name="name">Titres immobilisés de l'activité de portefeuille</field>
       <field name="code">2973</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
     <record id="pcg_2974" model="account.account.template">
       <field name="name">Prêts (même ventilation que celle du compte 274)</field>
       <field name="code">2974</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2756,8 +2355,7 @@
       <field name="name">Dépôts et cautionnements versés (même ventilation que celle du compte 275)</field>
       <field name="code">2975</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2765,8 +2363,7 @@
       <field name="name">Autres créances immobilisées (même ventilation que celle du compte 276)</field>
       <field name="code">2976</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_immobilisations"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_297"/>
     </record>
 
@@ -2774,8 +2371,7 @@
       <field name="name">Comptes de stocks et d'en-cours</field>
       <field name="code">Classe 3</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -2783,8 +2379,7 @@
       <field name="name">Matières premières (et fourniture)</field>
       <field name="code">31</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2792,7 +2387,7 @@
       <field name="name">Matière (ou groupe) A</field>
       <field name="code">311</field>
       <field name="type">other</field>
-          <field name="user_type" ref="account_type_stocks" />
+          <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2800,8 +2395,7 @@
       <field name="name">Matière (ou groupe) B</field>
       <field name="code">312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2809,8 +2403,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">317</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_31"/>
     </record>
 
@@ -2818,8 +2411,7 @@
       <field name="name">Autres approvisionnements</field>
       <field name="code">32</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2827,8 +2419,7 @@
       <field name="name">Matières consommables</field>
       <field name="code">321</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2836,8 +2427,7 @@
       <field name="name">Matière (ou groupe) C</field>
       <field name="code">3211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_321"/>
     </record>
 
@@ -2845,8 +2435,7 @@
       <field name="name">Matière (ou groupe) D</field>
       <field name="code">3212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_321"/>
     </record>
 
@@ -2854,8 +2443,7 @@
       <field name="name">Fournitures consommables</field>
       <field name="code">322</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2863,8 +2451,7 @@
       <field name="name">Combustibles</field>
       <field name="code">3221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2872,8 +2459,7 @@
       <field name="name">Produits d'entretien</field>
       <field name="code">3222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2881,8 +2467,7 @@
       <field name="name">Fournitures d'atelier et d usine</field>
       <field name="code">3223</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2890,8 +2475,7 @@
       <field name="name">Fournitures de magasin</field>
       <field name="code">3224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2899,8 +2483,7 @@
       <field name="name">Fournitures de bureau</field>
       <field name="code">3225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_322"/>
     </record>
 
@@ -2908,8 +2491,7 @@
       <field name="name">Emballages</field>
       <field name="code">326</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_32"/>
     </record>
 
@@ -2917,8 +2499,7 @@
       <field name="name">Emballages perdus</field>
       <field name="code">3261</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2926,8 +2507,7 @@
       <field name="name">Emballages récupérables non identifiables</field>
       <field name="code">3265</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2935,8 +2515,7 @@
       <field name="name">Emballages à usage mixte</field>
       <field name="code">3267</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_326"/>
     </record>
 
@@ -2944,8 +2523,7 @@
       <field name="name">En-cours de production de biens</field>
       <field name="code">33</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -2953,8 +2531,7 @@
       <field name="name">Produits en cours</field>
       <field name="code">331</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_33"/>
     </record>
 
@@ -2962,8 +2539,7 @@
       <field name="name">Produit en cours P 1</field>
       <field name="code">3311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_331"/>
     </record>
 
@@ -2971,8 +2547,7 @@
       <field name="name">Produit en cours P 2</field>
       <field name="code">3312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_331"/>
     </record>
 
@@ -2980,8 +2555,7 @@
       <field name="name">Travaux en cours</field>
       <field name="code">335</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_33"/>
     </record>
 
@@ -2989,8 +2563,7 @@
       <field name="name">Travaux en cours T 1</field>
       <field name="code">3351</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_335"/>
     </record>
 
@@ -2998,8 +2571,7 @@
       <field name="name">Travaux en cours T 2</field>
       <field name="code">3352</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_335"/>
     </record>
 
@@ -3007,8 +2579,7 @@
       <field name="name">En-cours de production de services</field>
       <field name="code">34</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3016,8 +2587,7 @@
       <field name="name">Études en cours</field>
       <field name="code">341</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_34"/>
     </record>
 
@@ -3025,8 +2595,7 @@
       <field name="name">Études en cours E 1</field>
       <field name="code">3411</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_341"/>
     </record>
 
@@ -3034,8 +2603,7 @@
       <field name="name">Études en cours E 2</field>
       <field name="code">3412</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_341"/>
     </record>
 
@@ -3043,8 +2611,7 @@
       <field name="name">Prestations de services en cours</field>
       <field name="code">345</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_34"/>
     </record>
 
@@ -3052,8 +2619,7 @@
       <field name="name">Prestations de services S 1</field>
       <field name="code">3451</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_345"/>
     </record>
 
@@ -3061,8 +2627,7 @@
       <field name="name">Prestations de services S 2</field>
       <field name="code">3452</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_345"/>
     </record>
 
@@ -3070,8 +2635,7 @@
       <field name="name">Stocks de produits</field>
       <field name="code">35</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3079,8 +2643,7 @@
       <field name="name">Produits intermédiaires</field>
       <field name="code">351</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3088,8 +2651,7 @@
       <field name="name">Produits intermédiaires (ou groupe) A </field>
       <field name="code">3511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_351"/>
     </record>
 
@@ -3097,8 +2659,7 @@
       <field name="name">Produits intermédiaires (ou groupe) B</field>
       <field name="code">3512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_351"/>
     </record>
 
@@ -3106,8 +2667,7 @@
       <field name="name">Produits finis</field>
       <field name="code">355</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3115,8 +2675,7 @@
       <field name="name">Produits finis (ou groupe) A</field>
       <field name="code">3551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_355"/>
     </record>
 
@@ -3124,8 +2683,7 @@
       <field name="name">Produits finis (ou groupe) B</field>
       <field name="code">3552</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_355"/>
     </record>
 
@@ -3133,8 +2691,7 @@
       <field name="name">Produits résiduels (ou matières de récupération)</field>
       <field name="code">358</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_35"/>
     </record>
 
@@ -3142,8 +2699,7 @@
       <field name="name">Déchets</field>
       <field name="code">3581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3151,8 +2707,7 @@
       <field name="name">Rebuts</field>
       <field name="code">3585</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3160,8 +2715,7 @@
       <field name="name">Matières de récupération</field>
       <field name="code">3586</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_358"/>
     </record>
 
@@ -3169,8 +2723,7 @@
       <field name="name">Stocks provenant d'immobilisations</field>
       <field name="code">36</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3178,8 +2731,7 @@
       <field name="name">Stocks de marchandises</field>
       <field name="code">37</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3187,8 +2739,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">371</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_37"/>
     </record>
 
@@ -3196,8 +2747,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">372</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_37"/>
     </record>
 
@@ -3205,8 +2755,7 @@
       <field name="name">Stocks en voie d'acheminement</field>
       <field name="code">38</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3214,8 +2763,7 @@
       <field name="name">Provisions pour dépréciation des stocks et en-cours</field>
       <field name="code">39</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_3"/>
     </record>
 
@@ -3223,8 +2771,7 @@
       <field name="name">Provisions pour dépréciation des matières premières (et fournitures)</field>
       <field name="code">391</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3232,8 +2779,7 @@
       <field name="name">Matières (ou groupe) A</field>
       <field name="code">3911</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3241,8 +2787,7 @@
       <field name="name">Matières (ou groupe) B</field>
       <field name="code">3912</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3250,8 +2795,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">3917</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_391"/>
     </record>
 
@@ -3259,8 +2803,7 @@
       <field name="name">Provisions pour dépréciation des autres approvisionnements</field>
       <field name="code">392</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3268,8 +2811,7 @@
       <field name="name">Matières consommables (même ventilation que celle du compte 321)</field>
       <field name="code">3921</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3277,8 +2819,7 @@
       <field name="name">Fournitures consommables (même ventilation que celle du compte 322)</field>
       <field name="code">3922</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3286,8 +2827,7 @@
       <field name="name">Emballages (même ventilation que celle du compte 326)</field>
       <field name="code">3926</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_392"/>
     </record>
 
@@ -3295,8 +2835,7 @@
       <field name="name">Provisions pour dépréciation des en-cours de production de biens</field>
       <field name="code">393</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3304,8 +2843,7 @@
       <field name="name">Produits en cours (même ventilation que celle du compte 331)</field>
       <field name="code">3931</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_393"/>
     </record>
 
@@ -3313,8 +2851,7 @@
       <field name="name">Travaux en cours (même ventilation que celle du compte 335)</field>
       <field name="code">3935</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_393"/>
     </record>
 
@@ -3322,8 +2859,7 @@
       <field name="name">Provisions pour dépréciation des en-cours de production de services</field>
       <field name="code">394</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3331,8 +2867,7 @@
       <field name="name">Études en cours (même ventilation que celle du compte 341)</field>
       <field name="code">3941</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_394"/>
     </record>
 
@@ -3340,8 +2875,7 @@
       <field name="name">Prestations de services en cours (même ventilation que celle du compte 345)</field>
       <field name="code">3945</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_394"/>
     </record>
 
@@ -3349,8 +2883,7 @@
       <field name="name">Provisions pour dépréciation des stocks de produits</field>
       <field name="code">395</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3358,8 +2891,7 @@
       <field name="name">Produits intermédiaires (même ventilation que celle du compte 351)</field>
       <field name="code">3951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_395"/>
     </record>
 
@@ -3367,8 +2899,7 @@
       <field name="name">Produits finis (même ventilation que celle du compte 355)</field>
       <field name="code">3955</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_395"/>
     </record>
 
@@ -3376,8 +2907,7 @@
       <field name="name">Provisions pour dépréciation des stocks de marchandises</field>
       <field name="code">397</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_39"/>
     </record>
 
@@ -3385,8 +2915,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">3971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_397"/>
     </record>
 
@@ -3394,8 +2923,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">3972</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_397"/>
     </record>
 
@@ -3403,7 +2931,7 @@
       <field name="name">Comptes de tiers</field>
       <field name="code">Classe 4</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -3411,7 +2939,7 @@
       <field name="name">Fournisseurs et comptes rattachés</field>
       <field name="code">40</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3420,7 +2948,7 @@
       <field name="name">Fournisseurs et comptes rattachés </field>
       <field name="code">400</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3429,7 +2957,7 @@
       <field name="name">Fournisseurs</field>
       <field name="code">401</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3439,7 +2967,7 @@
       <field name="name">Fournisseurs - Achats de biens et prestations de services</field>
       <field name="code">4011</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_401"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3449,7 +2977,7 @@
       <field name="name">Fournisseurs - Retenues de garantie</field>
       <field name="code">4017</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_401"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3458,7 +2986,7 @@
       <field name="name">Fournisseurs - Effets à payer</field>
       <field name="code">403</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3467,7 +2995,7 @@
       <field name="name">Fournisseurs d'immobilisations</field>
       <field name="code">404</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3476,7 +3004,7 @@
       <field name="name">Fournisseurs - Achats d'immobilisations</field>
       <field name="code">4041</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_404"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3485,7 +3013,7 @@
       <field name="name">Fournisseurs d'immobilisations - Retenues de garantie</field>
       <field name="code">4047</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_404"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3494,7 +3022,7 @@
       <field name="name">Fournisseurs d'immobilisations - Effets à payer</field>
       <field name="code">405</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3503,8 +3031,7 @@
       <field name="name">Fournisseurs - Factures non parvenues</field>
       <field name="code">408</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3513,8 +3040,7 @@
       <field name="name">Fournisseurs</field>
       <field name="code">4081</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3523,7 +3049,7 @@
       <field name="name">Fournisseurs d'immobilisations </field>
       <field name="code">4084</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3532,8 +3058,7 @@
       <field name="name">Fournisseurs - Intérêts courus</field>
       <field name="code">4088</field>
       <field name="type">payable</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_408"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3542,8 +3067,7 @@
       <field name="name">Fournisseurs débiteurs</field>
       <field name="code">409</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_payable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_40"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3552,8 +3076,7 @@
       <field name="name">Fournisseurs - Avances et acomptes versés sur commandes</field>
       <field name="code">4091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3562,8 +3085,7 @@
       <field name="name">Fournisseurs - Créances pour emballages et matériel à rendre</field>
       <field name="code">4096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3572,8 +3094,7 @@
       <field name="name">Fournisseurs - Autres avoirs</field>
       <field name="code">4097</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_view" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3582,8 +3103,7 @@
       <field name="name">Fournisseurs d'exploitation</field>
       <field name="code">40971</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_4097"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3592,8 +3112,7 @@
       <field name="name">Fournisseurs d'immobilisations</field>
       <field name="code">40974</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_4097"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3602,8 +3121,7 @@
       <field name="name">Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus</field>
       <field name="code">4098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_stocks" />
-
+      <field name="user_type" ref="account.data_account_type_asset" />
       <field name="parent_id" ref="pcg_409"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3612,8 +3130,7 @@
       <field name="name">Clients et comptes rattachés</field>
       <field name="code">41</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3622,8 +3139,7 @@
       <field name="name">Clients et comptes rattachés </field>
       <field name="code">410</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3632,8 +3148,7 @@
       <field name="name">Clients</field>
       <field name="code">411</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3643,8 +3158,7 @@
       <field name="name">Clients - Ventes de biens ou de prestations de services</field>
       <field name="code">4111</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_411"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3654,8 +3168,7 @@
       <field name="name">Clients - Retenues de garantie</field>
       <field name="code">4117</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_411"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3664,8 +3177,7 @@
       <field name="name">Clients - Effets à recevoir</field>
       <field name="code">413</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3674,8 +3186,7 @@
       <field name="name">Clients douteux ou litigieux</field>
       <field name="code">416</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3684,8 +3195,7 @@
       <field name="name">Clients - Produits non encore facturés</field>
       <field name="code">418</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3694,8 +3204,7 @@
       <field name="name">Clients - Factures à établir </field>
       <field name="code">4181</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_418"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3704,8 +3213,7 @@
       <field name="name">Clients - Intérêts courus</field>
       <field name="code">4188</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_418"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3714,8 +3222,7 @@
       <field name="name">Clients créditeurs</field>
       <field name="code">419</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_41"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3724,8 +3231,7 @@
       <field name="name">Clients - Avances et acomptes reçus sur commandes</field>
       <field name="code">4191</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3734,8 +3240,7 @@
       <field name="name">Clients - Dettes pour emballages et matériels consignés </field>
       <field name="code">4196</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3744,8 +3249,7 @@
       <field name="name">Clients - Autres avoirs </field>
       <field name="code">4197</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3754,8 +3258,7 @@
       <field name="name">Rabais, remises, ristournes à accorder et autres avoirs à établir</field>
       <field name="code">4198</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_419"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3764,17 +3267,15 @@
       <field name="name">Personnel et comptes rattachés</field>
       <field name="code">42</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
     <record id="pcg_421" model="account.account.template">
       <field name="name">Personnel - Rémunérations dues</field>
       <field name="code">421</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3783,8 +3284,7 @@
       <field name="name">Comités d'entreprise d'établissement </field>
       <field name="code">422</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3793,8 +3293,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">424</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3803,8 +3302,7 @@
       <field name="name">Réserve spéciale</field>
       <field name="code">4246</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_424"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3813,8 +3311,7 @@
       <field name="name">Comptes courants</field>
       <field name="code">4248</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_424"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3823,8 +3320,7 @@
       <field name="name">Personnel - Avances et acomptes</field>
       <field name="code">425</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3833,8 +3329,7 @@
       <field name="name">Personnel - Dépôts</field>
       <field name="code">426</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3843,8 +3338,7 @@
       <field name="name">Personnel - Oppositions</field>
       <field name="code">427</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3853,8 +3347,7 @@
       <field name="name">Personnel - Charges à payer et produits à recevoir</field>
       <field name="code">428</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_42"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3863,8 +3356,7 @@
       <field name="name">Dettes provisionnées pour congés à payer</field>
       <field name="code">4282</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3873,8 +3365,7 @@
       <field name="name">Dettes provisionnées pour participation des salariés aux résultats</field>
       <field name="code">4284</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3883,8 +3374,7 @@
       <field name="name">Autres charges à payer</field>
       <field name="code">4286</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3893,8 +3383,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4287</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_428"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3903,8 +3392,7 @@
       <field name="name">Sécurité Sociale et autres organismes sociaux</field>
       <field name="code">43</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -3912,8 +3400,7 @@
       <field name="name">Sécurité Sociale</field>
       <field name="code">431</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3921,9 +3408,8 @@
     <record id="pcg_437" model="account.account.template">
       <field name="name">Autres organismes sociaux</field>
       <field name="code">437</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3932,8 +3418,7 @@
       <field name="name">Organismes sociaux - Charges à payer et produits à recevoir</field>
       <field name="code">438</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_43"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3942,8 +3427,7 @@
       <field name="name">Charges sociales sur congés à payer </field>
       <field name="code">4382</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3952,8 +3436,7 @@
       <field name="name">Autres charges à payer</field>
       <field name="code">4386</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3962,8 +3445,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4387</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_438"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3972,8 +3454,7 @@
       <field name="name">Etat et autres collectivités publiques</field>
       <field name="code">44</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -3981,8 +3462,7 @@
       <field name="name">État - Subventions à recevoir</field>
       <field name="code">441</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3991,8 +3471,7 @@
       <field name="name">Subventions d'investissement</field>
       <field name="code">4411</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4001,8 +3480,7 @@
       <field name="name">Subventions d'exploitation</field>
       <field name="code">4417</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4011,8 +3489,7 @@
       <field name="name">Subventions d'équilibre</field>
       <field name="code">4418</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4021,8 +3498,7 @@
       <field name="name">Avances sur subventions</field>
       <field name="code">4419</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_441"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4031,8 +3507,7 @@
       <field name="name">État -Impôts et taxes recouvrables sur des tiers </field>
       <field name="code">442</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4041,8 +3516,7 @@
       <field name="name">Obligataires</field>
       <field name="code">4424</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_442"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4051,8 +3525,7 @@
       <field name="name">Associés</field>
       <field name="code">4425</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_442"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4061,8 +3534,7 @@
       <field name="name">Opérations particulières avec l'État, les collectivités publiques, les organismes internationaux</field>
       <field name="code">443</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4071,8 +3543,7 @@
       <field name="name">Créances sur l'État résultant de la suppression de la règle du décalage d'un mois en matière de TVA</field>
       <field name="code">4431</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_443"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4081,8 +3552,7 @@
       <field name="name">Intérêts courus sur créances figurant au compte 4431</field>
       <field name="code">4438</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_443"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4091,8 +3561,7 @@
       <field name="name">État - Impôts sur les bénéfices</field>
       <field name="code">444</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4101,8 +3570,7 @@
       <field name="name">État - Taxes sur le chiffre d'affaires</field>
       <field name="code">445</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4111,8 +3579,7 @@
       <field name="name">TVA due intracommunautaire</field>
       <field name="code">4452</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4121,8 +3588,7 @@
       <field name="name">TVA due intracommunautaire 19,6%</field>
       <field name="code">445201</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4131,8 +3597,7 @@
       <field name="name">TVA due intracommunautaire 5,5%</field>
       <field name="code">445202</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4141,8 +3606,7 @@
       <field name="name">TVA due intracommunautaire (autre taux)</field>
       <field name="code">445203</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4452"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4151,8 +3615,7 @@
       <field name="name">Taxes sur le chiffre d'affaires à décaisser</field>
       <field name="code">4455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4161,8 +3624,7 @@
       <field name="name">TVA à décaisser</field>
       <field name="code">44551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4171,8 +3633,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44558</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4181,8 +3642,7 @@
       <field name="name">Taxes sur le chiffre d'affaires déductibles</field>
       <field name="code">4456</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4191,8 +3651,7 @@
       <field name="name">TVA sur immobilisations</field>
       <field name="code">44562</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4201,8 +3660,7 @@
       <field name="name">TVA transférée par d'autres entreprises</field>
       <field name="code">44563</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4211,8 +3669,7 @@
       <field name="name">TVA sur autres biens et services</field>
       <field name="code">44566</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4221,8 +3678,7 @@
       <field name="name">TVA déductible intracommunautaire</field>
       <field name="code">445662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4231,9 +3687,8 @@
       <field name="name">Crédit de TVA à reporter</field>
       <field name="code">44567</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="note">Si le remboursement n'a pas été demandé</field>
-
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4242,8 +3697,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44568</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4252,8 +3706,7 @@
       <field name="name">Taxes sur le chiffre d'affaires collectées par l'entreprise</field>
       <field name="code">4457</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4262,8 +3715,7 @@
       <field name="name">TVA collectée</field>
       <field name="code">44571</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_4457"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4272,8 +3724,7 @@
       <field name="name">TVA collectée 19,6%</field>
       <field name="code">445711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4282,8 +3733,7 @@
       <field name="name">TVA collectée 5,5%</field>
       <field name="code">445712</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4292,8 +3742,7 @@
       <field name="name">TVA collectée (autre taux)</field>
       <field name="code">445713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44571"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4302,8 +3751,7 @@
       <field name="name">Taxes assimilées à la TVA</field>
       <field name="code">44578</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4457"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4312,8 +3760,7 @@
       <field name="name">Taxes sur le chiffre d'affaires à régulariser ou en attente</field>
       <field name="code">4458</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_445"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4322,8 +3769,7 @@
       <field name="name">Acomptes - Régime simplifié d'imposition</field>
       <field name="code">44581</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4332,8 +3778,7 @@
       <field name="name">Acomptes - Régime du forfait</field>
       <field name="code">44582</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4342,8 +3787,7 @@
       <field name="name">Remboursement de taxes sur le chiffre d'affaires demandé</field>
       <field name="code">44583</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4352,8 +3796,7 @@
       <field name="name">TVA récupérée d'avance</field>
       <field name="code">44584</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4362,8 +3805,7 @@
       <field name="name">Taxes sur le chiffre d'affaires sur factures non parvenues</field>
       <field name="code">44586</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4372,8 +3814,7 @@
       <field name="name">Taxes sur le chiffre d'affaires sur factures à établir</field>
       <field name="code">44587</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_4458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4382,8 +3823,7 @@
       <field name="name">Obligations cautionnées</field>
       <field name="code">446</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4392,8 +3832,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés</field>
       <field name="code">447</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4402,8 +3841,7 @@
       <field name="name">État - Charges à payer et produits à recevoir</field>
       <field name="code">448</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4412,8 +3850,7 @@
       <field name="name">Charges fiscales sur congés à payer </field>
       <field name="code">4482</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4422,8 +3859,7 @@
       <field name="name">Charges à payer</field>
       <field name="code">4486</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4432,8 +3868,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4487</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_asset"/>
       <field name="parent_id" ref="pcg_448"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4442,8 +3877,7 @@
       <field name="name">Quotas d'émission à restituer à l'État</field>
       <field name="code">449</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_tax"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_44"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4452,8 +3886,7 @@
       <field name="name">Groupe et associés</field>
       <field name="code">45</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4461,8 +3894,7 @@
       <field name="name">Groupe</field>
       <field name="code">451</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4471,9 +3903,8 @@
       <field name="name">Associés - Comptes courants</field>
       <field name="code">455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pour frais avancés personnellement</field>
-
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4482,8 +3913,7 @@
       <field name="name">Principal</field>
       <field name="code">4551</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4492,8 +3922,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">4558</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4502,8 +3931,7 @@
       <field name="name">Associés - Opérations sur le capital</field>
       <field name="code">456</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4512,8 +3940,7 @@
       <field name="name">Associés - Comptes d'apport en société</field>
       <field name="code">4561</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4522,8 +3949,7 @@
       <field name="name">Apports en nature</field>
       <field name="code">45611</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4561"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4532,8 +3958,7 @@
       <field name="name">Apports en numéraire</field>
       <field name="code">45615</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4561"/>
       <field name="reconcile" eval="True"/>
    </record>
@@ -4542,8 +3967,7 @@
       <field name="name">Apporteurs - Capital appelé, non versé</field>
       <field name="code">4562</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4552,8 +3976,7 @@
       <field name="name">Actionnaires - Capital souscrit et appelé, non versé</field>
       <field name="code">45621</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4562"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4562,8 +3985,7 @@
       <field name="name">Associés - Capital appelé, non versé</field>
       <field name="code">45625</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_4562"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4572,8 +3994,7 @@
       <field name="name">Associés - Versements reçus sur augmentation de capital</field>
       <field name="code">4563</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4582,8 +4003,7 @@
       <field name="name">Associés - Versements anticipés</field>
       <field name="code">4564</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4592,8 +4012,7 @@
       <field name="name">Actionnaires défaillants</field>
       <field name="code">4566</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4602,8 +4021,7 @@
       <field name="name">Associés - Capital à rembourser</field>
       <field name="code">4567</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_456"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4612,8 +4030,7 @@
       <field name="name">Associés - Dividendes à payer</field>
       <field name="code">457</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4622,8 +4039,7 @@
       <field name="name">Associés - Opérations faites en commun et en GIE</field>
       <field name="code">458</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4632,8 +4048,7 @@
       <field name="name">Opérations courantes</field>
       <field name="code">4581</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4642,8 +4057,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">4588</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_458"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4652,8 +4066,7 @@
       <field name="name">Débiteurs divers et créditeurs divers</field>
       <field name="code">46</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4661,8 +4074,7 @@
       <field name="name">Créances sur cessions d'immobilisations</field>
       <field name="code">462</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4671,8 +4083,7 @@
       <field name="name">Dettes sur acquisitions de valeurs mobilières de placement</field>
       <field name="code">464</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4681,8 +4092,7 @@
       <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
       <field name="code">465</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4690,9 +4100,8 @@
     <record id="pcg_467" model="account.account.template">
       <field name="name">Autres comptes débiteurs ou créditeurs</field>
       <field name="code">467</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_46"/>
     </record>
 
@@ -4700,8 +4109,7 @@
       <field name="name">Divers - Charges à payer et produits à recevoir</field>
       <field name="code">468</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_46"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4710,8 +4118,7 @@
       <field name="name">Charges à payer</field>
       <field name="code">4686</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_468"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4720,8 +4127,7 @@
       <field name="name">Produits à recevoir</field>
       <field name="code">4687</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_468"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4730,8 +4136,7 @@
       <field name="name">Comptes transitoires ou d'attente</field>
       <field name="code">47</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4739,8 +4144,7 @@
       <field name="name">Comptes d'attente 1</field>
       <field name="code">471</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4749,8 +4153,7 @@
       <field name="name">Comptes d'attente 2</field>
       <field name="code">472</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4759,8 +4162,7 @@
       <field name="name">Comptes d'attente 3</field>
       <field name="code">473</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4769,8 +4171,7 @@
       <field name="name">Comptes d'attente 4</field>
       <field name="code">474</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4779,8 +4180,7 @@
       <field name="name">Comptes d'attente 5</field>
       <field name="code">475</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4789,8 +4189,7 @@
       <field name="name">Différences de conversion - ACTIF</field>
       <field name="code">476</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4799,8 +4198,7 @@
       <field name="name">Diminution des créances</field>
       <field name="code">4761</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4809,8 +4207,7 @@
       <field name="name">Augmentation des dettes</field>
       <field name="code">4762</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4819,8 +4216,7 @@
       <field name="name">Différences compensées par couverture de change</field>
       <field name="code">4768</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_476"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4829,8 +4225,7 @@
       <field name="name">Différences de conversion - PASSIF</field>
       <field name="code">477</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_47"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4839,8 +4234,7 @@
       <field name="name">Augmentation des créances</field>
       <field name="code">4771</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4849,8 +4243,7 @@
       <field name="name">Diminution des dettes</field>
       <field name="code">4772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4859,8 +4252,7 @@
       <field name="name">Différences compensées par couverture de change</field>
       <field name="code">4778</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_477"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4868,9 +4260,8 @@
     <record id="pcg_478" model="account.account.template">
       <field name="name">Autres comptes transitoires</field>
       <field name="code">478</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_47"/>
     </record>
 
@@ -4878,8 +4269,7 @@
       <field name="name">Comptes de régularisation</field>
       <field name="code">48</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4887,8 +4277,7 @@
       <field name="name">Charges à répartir sur plusieurs exercices </field>
       <field name="code">481</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4897,8 +4286,7 @@
       <field name="name">Frais d'émission des emprunts</field>
       <field name="code">4816</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_481"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4907,8 +4295,7 @@
       <field name="name">Charges constatées d'avance</field>
       <field name="code">486</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4917,8 +4304,7 @@
       <field name="name">Produits constatés d'avance</field>
       <field name="code">487</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4927,8 +4313,7 @@
       <field name="name">Comptes de répartition périodique des charges et des produits</field>
       <field name="code">488</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_48"/>
     </record>
 
@@ -4936,8 +4321,7 @@
       <field name="name">Charges</field>
       <field name="code">4886</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_488"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4946,8 +4330,7 @@
       <field name="name">Produits</field>
       <field name="code">4887</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_488"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4956,8 +4339,7 @@
       <field name="name">Quotas d'émission alloués par l'État</field>
       <field name="code">489</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_48"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4966,8 +4348,7 @@
       <field name="name">Dépréciations des comptes de tiers</field>
       <field name="code">49</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_4"/>
     </record>
 
@@ -4975,8 +4356,7 @@
       <field name="name">Dépréciation des comptes de clients</field>
       <field name="code">491</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4985,8 +4365,7 @@
       <field name="name">Dépréciation des comptes du groupe et des associés</field>
       <field name="code">495</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -4995,8 +4374,7 @@
       <field name="name">Comptes du groupe</field>
       <field name="code">4951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5005,8 +4383,7 @@
       <field name="name">Comptes courants des associés</field>
       <field name="code">4955</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5015,8 +4392,7 @@
       <field name="name">Opérations faites en commun et en GIE</field>
       <field name="code">4958</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_dettes"/>
-
+      <field name="user_type" ref="account.data_account_type_liability"/>
       <field name="parent_id" ref="pcg_495"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5025,8 +4401,7 @@
       <field name="name">Dépréciations des comptes de débiteurs divers</field>
       <field name="code">496</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_49"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5035,8 +4410,7 @@
       <field name="name">Créances sur cessions d'immobilisations</field>
       <field name="code">4962</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5045,8 +4419,7 @@
       <field name="name">Créances sur cessions de valeurs mobilières de placement</field>
       <field name="code">4965</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5055,8 +4428,7 @@
       <field name="name">Autres comptes débiteurs</field>
       <field name="code">4967</field>
       <field name="type">receivable</field>
-      <field name="user_type" ref="account_type_receivable"/>
-
+      <field name="user_type" ref="account.data_account_type_receivable"/>
       <field name="parent_id" ref="pcg_496"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5065,8 +4437,7 @@
       <field name="name">Comptes financiers</field>
       <field name="code">Classe 5</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_1_a_5"/>
     </record>
 
@@ -5074,8 +4445,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">50</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5083,8 +4453,7 @@
       <field name="name">Parts dans entreprises liées</field>
       <field name="code">501</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5092,8 +4461,7 @@
       <field name="name">Actions propres</field>
       <field name="code">502</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5101,8 +4469,7 @@
       <field name="name">Actions</field>
       <field name="code">503</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5110,8 +4477,7 @@
       <field name="name">Titres cotés</field>
       <field name="code">5031</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_503"/>
     </record>
 
@@ -5119,8 +4485,7 @@
       <field name="name">Titres non cotés</field>
       <field name="code">5035</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_503"/>
     </record>
 
@@ -5128,8 +4493,7 @@
       <field name="name">Autres titres conférant un droit de propriété</field>
       <field name="code">504</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5137,8 +4501,7 @@
       <field name="name">Obligations et bons émis par la société et rachetés par elle</field>
       <field name="code">505</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5146,8 +4509,7 @@
       <field name="name">Obligations</field>
       <field name="code">506</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5155,8 +4517,7 @@
       <field name="name">Titres cotés</field>
       <field name="code">5061</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_506"/>
     </record>
 
@@ -5164,8 +4525,7 @@
       <field name="name">Titres non cotés</field>
       <field name="code">5065</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_506"/>
     </record>
 
@@ -5173,8 +4533,7 @@
       <field name="name">Bons du Trésor et bons de caisse à court terme</field>
       <field name="code">507</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5182,8 +4541,7 @@
       <field name="name">Autres valeurs mobilières de placement et autres créances assimilées</field>
       <field name="code">508</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5191,8 +4549,7 @@
       <field name="name">Autres valeurs mobilières</field>
       <field name="code">5081</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5200,8 +4557,7 @@
       <field name="name">Bons de souscription</field>
       <field name="code">5082</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5209,8 +4565,7 @@
       <field name="name">Intérêts courus sur obligations, bons et valeurs assimilées</field>
       <field name="code">5088</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_508"/>
     </record>
 
@@ -5218,8 +4573,7 @@
       <field name="name">Versements restant à effectuer sur valeurs mobilières de placement non libérées</field>
       <field name="code">509</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_50"/>
     </record>
 
@@ -5227,8 +4581,7 @@
       <field name="name">Banques établissements financiers et assimilés</field>
       <field name="code">51</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5236,8 +4589,7 @@
       <field name="name">Valeurs à l'encaissement</field>
       <field name="code">511</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5245,8 +4597,7 @@
       <field name="name">Coupons échus à l'encaissement</field>
       <field name="code">5111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5254,8 +4605,7 @@
       <field name="name">Chèques à encaisser</field>
       <field name="code">5112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5263,8 +4613,7 @@
       <field name="name">Effets à l'encaissement</field>
       <field name="code">5113</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5272,8 +4621,7 @@
       <field name="name">Effets à l'escompte</field>
       <field name="code">5114</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_511"/>
     </record>
 
@@ -5281,9 +4629,8 @@
       <field name="name">Banques</field>
       <field name="code">512</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Créer 1 compte par compte bancaire</field>
-
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5292,8 +4639,7 @@
       <field name="name">Comptes en monnaie nationale</field>
       <field name="code">5121</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="fr_pcg_cash"/>
     </record>
 
@@ -5302,8 +4648,7 @@
       <field name="name">Comptes en devises</field>
       <field name="code">5124</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="fr_pcg_cash"/>
     </record>
 
@@ -5311,7 +4656,7 @@
       <field name="name">Chèques postaux</field>
       <field name="code">514</field>
       <field name="type">other</field>
-          <field name="user_type" ref="account_type_cash"/>
+          <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5319,8 +4664,7 @@
       <field name="name">Caisses du Trésor et des établissements publics</field>
       <field name="code">515</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5328,8 +4672,7 @@
       <field name="name">Sociétés de bourse</field>
       <field name="code">516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5337,8 +4680,7 @@
       <field name="name">Autres organismes financiers</field>
       <field name="code">517</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5346,8 +4688,7 @@
       <field name="name">Intérêts courus</field>
       <field name="code">518</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5355,8 +4696,7 @@
       <field name="name">Intérêts courus à payer</field>
       <field name="code">5181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_518"/>
     </record>
 
@@ -5364,8 +4704,7 @@
       <field name="name">Intérêts courus à recevoir</field>
       <field name="code">5188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_518"/>
     </record>
 
@@ -5373,8 +4712,7 @@
       <field name="name">Concours bancaires courants</field>
       <field name="code">519</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_51"/>
     </record>
 
@@ -5382,8 +4720,7 @@
       <field name="name">Crédit de mobilisation de créances commerciales (CMCC)</field>
       <field name="code">5191</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5391,8 +4728,7 @@
       <field name="name">Mobilisation de créances nées à l'étranger</field>
       <field name="code">5193</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5400,8 +4736,7 @@
       <field name="name">Intérêts courus sur concours bancaires courants</field>
       <field name="code">5198</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_519"/>
     </record>
 
@@ -5409,8 +4744,7 @@
       <field name="name">Instruments de trésorerie</field>
       <field name="code">52</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5418,8 +4752,7 @@
       <field name="name">Caisse</field>
       <field name="code">53</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5427,8 +4760,7 @@
       <field name="name">Caisse siège social</field>
       <field name="code">531</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5436,8 +4768,7 @@
       <field name="name">Caisse en monnaie nationale</field>
       <field name="code">5311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_531"/>
     </record>
 
@@ -5445,8 +4776,7 @@
       <field name="name">Caisse en devises</field>
       <field name="code">5314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_531"/>
     </record>
 
@@ -5454,8 +4784,7 @@
       <field name="name">Caisse succursale (ou usine) A</field>
       <field name="code">532</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5463,8 +4792,7 @@
       <field name="name">Caisse succursale (ou usine) B</field>
       <field name="code">533</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_53"/>
     </record>
 
@@ -5472,8 +4800,7 @@
       <field name="name">Régies d'avances et accréditifs</field>
       <field name="code">54</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5481,8 +4808,7 @@
       <field name="name">Virements internes</field>
       <field name="code">58</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -5491,8 +4817,7 @@
       <field name="name">Provisions pour dépréciation des comptes financiers</field>
       <field name="code">59</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_5"/>
     </record>
 
@@ -5500,8 +4825,7 @@
       <field name="name">Provisions pour dépréciation des valeurs mobilières de placement</field>
       <field name="code">590</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_59"/>
     </record>
 
@@ -5509,8 +4833,7 @@
       <field name="name">Actions</field>
       <field name="code">5903</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5518,8 +4841,7 @@
       <field name="name">Autres titres conférant un droit de propriété </field>
       <field name="code">5904</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5527,8 +4849,7 @@
       <field name="name">Obligations</field>
       <field name="code">5906</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5536,8 +4857,7 @@
       <field name="name">Autres valeurs mobilières de placement et créances assimilées (provisions)</field>
       <field name="code">5908</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_cash"/>
-
+      <field name="user_type" ref="account.data_account_type_cash"/>
       <field name="parent_id" ref="pcg_590"/>
     </record>
 
@@ -5545,8 +4865,7 @@
       <field name="name">Comptes de gestion</field>
       <field name="code">Classes 6 et 7</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_0"/>
     </record>
 
@@ -5554,8 +4873,7 @@
       <field name="name">Comptes de charges</field>
       <field name="code">Classe 6</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_6_et_7"/>
     </record>
 
@@ -5563,8 +4881,7 @@
       <field name="name">Achats(sauf 603)</field>
       <field name="code">60</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -5572,9 +4889,8 @@
       <field name="name">Achats stockés - Matières premières (et fournitures)</field>
       <field name="code">601</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Destinés à la production ou revente</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5582,8 +4898,7 @@
       <field name="name">Matières (ou groupe) A</field>
       <field name="code">6011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5591,8 +4906,7 @@
       <field name="name">Matières (ou groupe) B</field>
       <field name="code">6012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5600,8 +4914,7 @@
       <field name="name">Fournitures A, B, C, ..</field>
       <field name="code">6017</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_601"/>
     </record>
 
@@ -5609,9 +4922,8 @@
       <field name="name">Achats stockés - Autres approvisionnements</field>
       <field name="code">602</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Destinés à la production ou revente</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5619,8 +4931,7 @@
       <field name="name">Matières consommables</field>
       <field name="code">6021</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5628,8 +4939,7 @@
       <field name="name">Matières (ou groupe) C</field>
       <field name="code">60211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6021"/>
     </record>
 
@@ -5637,8 +4947,7 @@
       <field name="name">Matières (ou groupe) D</field>
       <field name="code">60212</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6021"/>
     </record>
 
@@ -5646,8 +4955,7 @@
       <field name="name">Fournitures consommables</field>
       <field name="code">6022</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5655,8 +4963,7 @@
       <field name="name">Combustibles</field>
       <field name="code">60221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5664,8 +4971,7 @@
       <field name="name">Produits d'entretien</field>
       <field name="code">60222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5673,8 +4979,7 @@
       <field name="name">Fournitures d'atelier et d'usine</field>
       <field name="code">60223</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5682,8 +4987,7 @@
       <field name="name">Fournitures de magasin</field>
       <field name="code">60224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5691,8 +4995,7 @@
       <field name="name">Fournitures de bureau</field>
       <field name="code">60225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6022"/>
     </record>
 
@@ -5700,8 +5003,7 @@
       <field name="name">Emballages</field>
       <field name="code">6026</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_602"/>
     </record>
 
@@ -5709,8 +5011,7 @@
       <field name="name">Emballages perdus</field>
       <field name="code">60261</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5718,8 +5019,7 @@
       <field name="name">Emballages récupérables non identifiables</field>
       <field name="code">60265</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5727,8 +5027,7 @@
       <field name="name">Emballages à usage mixte</field>
       <field name="code">60267</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6026"/>
     </record>
 
@@ -5737,9 +5036,8 @@
       <field name="name">Variation des stocks (approvisionnements et marchandises)</field>
       <field name="code">603</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Utilisé lors des inventaires</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5748,8 +5046,7 @@
       <field name="name">Variation des stocks de matières premières (et fournitures)</field>
       <field name="code">6031</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5757,8 +5054,7 @@
       <field name="name">Variation des stocks des autres approvisionnements</field>
       <field name="code">6032</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5766,8 +5062,7 @@
       <field name="name">Variation des stocks de marchandises</field>
       <field name="code">6037</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_603"/>
     </record>
 
@@ -5776,8 +5071,7 @@
       <field name="name">Achats d'études et prestations de services</field>
       <field name="code">604</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5785,8 +5079,7 @@
       <field name="name">Achats de matériel équipements et travaux</field>
       <field name="code">605</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5794,9 +5087,8 @@
       <field name="name">Achats non stockés de matières et fournitures</field>
       <field name="code">606</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Pour l'usage interne à l'entreprise</field>
-
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5804,8 +5096,7 @@
       <field name="name">Fournitures non stockables (eau, énergie...) </field>
       <field name="code">6061</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5813,8 +5104,7 @@
       <field name="name">Fournitures d'entretien et de petit équipement</field>
       <field name="code">6063</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5822,8 +5112,7 @@
       <field name="name">Fournitures administratives</field>
       <field name="code">6064</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5831,8 +5120,7 @@
       <field name="name">Autres matières et fournitures</field>
       <field name="code">6068</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_606"/>
     </record>
 
@@ -5840,9 +5128,8 @@
       <field name="name">Achats de marchandises</field>
       <field name="code">607</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-      <field name="note">Biens revendus tels quels (707) soit une marge</field>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
+      <field name="note">Biens revendus tels quels (707)</field>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5850,9 +5137,8 @@
       <field name="name">Marchandise (ou groupe) A</field>
       <field name="code">6071</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Pour achats France</field>
-
       <field name="parent_id" ref="fr_pcg_expense"/>
     </record>
 
@@ -5860,9 +5146,8 @@
       <field name="name">Marchandise (ou groupe) B</field>
       <field name="code">6072</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Pour déclaration TVA intracommunautaire</field>
-
       <field name="parent_id" ref="fr_pcg_expense"/>
     </record>
 
@@ -5870,8 +5155,7 @@
       <field name="name">Frais accessoires incorporés aux achats</field>
       <field name="code">608</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5879,8 +5163,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur achats</field>
       <field name="code">609</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_60"/>
     </record>
 
@@ -5888,8 +5171,7 @@
       <field name="name">- de matières premières (et fournitures)</field>
       <field name="code">6091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5897,8 +5179,7 @@
       <field name="name">- d'autres approvisionnements stockés</field>
       <field name="code">6092</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5906,8 +5187,7 @@
       <field name="name">- d'études et prestations de services</field>
       <field name="code">6094</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5915,8 +5195,7 @@
       <field name="name">- de matériel, équipements et travaux</field>
       <field name="code">6095</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5924,8 +5203,7 @@
       <field name="name">- d'approvisionnements non stockés</field>
       <field name="code">6096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5933,8 +5211,7 @@
       <field name="name">- de marchandises</field>
       <field name="code">6097</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5942,8 +5219,7 @@
       <field name="name">Rabais, remises et ristournes non affectés</field>
       <field name="code">6098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_609"/>
     </record>
 
@@ -5951,8 +5227,7 @@
       <field name="name">Services extérieurs</field>
       <field name="code">61</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -5960,8 +5235,7 @@
       <field name="name">Sous-traitance générale</field>
       <field name="code">611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -5969,8 +5243,7 @@
       <field name="name">Redevances de crédit-bail</field>
       <field name="code">612</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -5978,8 +5251,7 @@
       <field name="name">Crédit-bail mobilier</field>
       <field name="code">6122</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_612"/>
     </record>
 
@@ -5987,8 +5259,7 @@
       <field name="name">Crédit-bail immobilier</field>
       <field name="code">6125</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_612"/>
     </record>
 
@@ -5996,8 +5267,7 @@
       <field name="name">Locations</field>
       <field name="code">613</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6005,8 +5275,7 @@
       <field name="name">Locations immobilières</field>
       <field name="code">6132</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6014,8 +5283,7 @@
       <field name="name">Locations mobilières</field>
       <field name="code">6135</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6023,8 +5291,7 @@
       <field name="name">Malis sur emballages</field>
       <field name="code">6136</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_613"/>
     </record>
 
@@ -6032,8 +5299,7 @@
       <field name="name">Charges locatives et de copropriété</field>
       <field name="code">614</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6041,8 +5307,7 @@
       <field name="name">Entretien et réparations</field>
       <field name="code">615</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6050,8 +5315,7 @@
       <field name="name">- sur biens immobiliers</field>
       <field name="code">6152</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6059,8 +5323,7 @@
       <field name="name">- sur biens mobiliers</field>
       <field name="code">6155</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6068,8 +5331,7 @@
       <field name="name">Maintenance</field>
       <field name="code">6156</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_615"/>
     </record>
 
@@ -6077,8 +5339,7 @@
       <field name="name">Primes d'assurance</field>
       <field name="code">616</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6086,8 +5347,7 @@
       <field name="name">Multirisques</field>
       <field name="code">6161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6095,8 +5355,7 @@
       <field name="name">Assurance obligatoire dommage construction </field>
       <field name="code">6162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6104,8 +5363,7 @@
       <field name="name">Assurance transport</field>
       <field name="code">6163</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6113,8 +5371,7 @@
       <field name="name">Assurance transport sur achats</field>
       <field name="code">61636</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6122,8 +5379,7 @@
       <field name="name">Assurance transportsur ventes</field>
       <field name="code">61637</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6131,8 +5387,7 @@
       <field name="name">Assurance transport sur autres biens</field>
       <field name="code">61638</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6163"/>
     </record>
 
@@ -6140,8 +5395,7 @@
       <field name="name">Risques d'exploitation</field>
       <field name="code">6164</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6149,8 +5403,7 @@
       <field name="name">Insolvabilité clients</field>
       <field name="code">6165</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_616"/>
     </record>
 
@@ -6158,8 +5411,7 @@
       <field name="name">Études et recherches</field>
       <field name="code">617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6167,8 +5419,7 @@
       <field name="name">Divers</field>
       <field name="code">618</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6176,8 +5427,7 @@
       <field name="name">Documentation générale</field>
       <field name="code">6181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6185,8 +5435,7 @@
       <field name="name">Documentation technique</field>
       <field name="code">6183</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6194,8 +5443,7 @@
       <field name="name">Frais de colloques, séminaires, conférences</field>
       <field name="code">6185</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_618"/>
     </record>
 
@@ -6203,8 +5451,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur services extérieurs</field>
       <field name="code">619</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_61"/>
     </record>
 
@@ -6212,8 +5459,7 @@
       <field name="name">Autres services extérieurs</field>
       <field name="code">62</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6221,8 +5467,7 @@
       <field name="name">Personnel extérieur à l'entreprise</field>
       <field name="code">621</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6230,8 +5475,7 @@
       <field name="name">Personnel intérimaire</field>
       <field name="code">6211</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_621"/>
     </record>
 
@@ -6239,8 +5483,7 @@
       <field name="name">Personnel détaché ou prêté à l'entreprise</field>
       <field name="code">6214</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_621"/>
     </record>
 
@@ -6248,8 +5491,7 @@
       <field name="name">Rémunérations d'intermédiaires et honoraires </field>
       <field name="code">622</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6257,8 +5499,7 @@
       <field name="name">Commissions et courtages sur achats </field>
       <field name="code">6221</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6266,8 +5507,7 @@
       <field name="name">Commissions et courtages sur ventes</field>
       <field name="code">6222</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6275,8 +5515,7 @@
       <field name="name">Rémunérations des transitaires</field>
       <field name="code">6224</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6284,8 +5523,7 @@
       <field name="name">Rémunérations d'affacturage</field>
       <field name="code">6225</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6293,8 +5531,7 @@
       <field name="name">Honoraires</field>
       <field name="code">6226</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6302,8 +5539,7 @@
       <field name="name">Frais d'actes et de contentieux</field>
       <field name="code">6227</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6311,8 +5547,7 @@
       <field name="name">Divers</field>
       <field name="code">6228</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_622"/>
     </record>
 
@@ -6320,9 +5555,8 @@
       <field name="name">Publicité, publications, relations publiques</field>
       <field name="code">623</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Dont annonces légales, greffe, cartes visites</field>
-
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6330,8 +5564,7 @@
       <field name="name">Annonces et insertions</field>
       <field name="code">6231</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6339,8 +5572,7 @@
       <field name="name">Échantillons</field>
       <field name="code">6232</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6348,8 +5580,7 @@
       <field name="name">Foires et expositions</field>
       <field name="code">6233</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6357,9 +5588,8 @@
       <field name="name">Cadeaux à la clientèle</field>
       <field name="code">6234</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">Attention déclaration DAS fin d'année</field>
-
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6367,8 +5597,7 @@
       <field name="name">Primes</field>
       <field name="code">6235</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6376,8 +5605,7 @@
       <field name="name">Catalogues et imprimés</field>
       <field name="code">6236</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6385,8 +5613,7 @@
       <field name="name">Publications</field>
       <field name="code">6237</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6394,8 +5621,7 @@
       <field name="name">Divers (pourboires, dons courants...)</field>
       <field name="code">6238</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_623"/>
     </record>
 
@@ -6403,8 +5629,7 @@
       <field name="name">Transports de biens et transports collectifs du personnel</field>
       <field name="code">624</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6412,8 +5637,7 @@
       <field name="name">Transports sur achats</field>
       <field name="code">6241</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6421,8 +5645,7 @@
       <field name="name">Transports sur ventes</field>
       <field name="code">6242</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6430,8 +5653,7 @@
       <field name="name">Transports entre établissements ou chantiers</field>
       <field name="code">6243</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6439,8 +5661,7 @@
       <field name="name">Transports administratifs</field>
       <field name="code">6244</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6448,8 +5669,7 @@
       <field name="name">Transports collectifs du personnel</field>
       <field name="code">6247</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6457,8 +5677,7 @@
       <field name="name">Divers</field>
       <field name="code">6248</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_624"/>
     </record>
 
@@ -6466,8 +5685,7 @@
       <field name="name">Déplacements missions et réceptions</field>
       <field name="code">625</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6475,8 +5693,7 @@
       <field name="name">Voyages et déplacements</field>
       <field name="code">6251</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6484,8 +5701,7 @@
       <field name="name">Frais de déménagement</field>
       <field name="code">6255</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6493,8 +5709,7 @@
       <field name="name">Missions</field>
       <field name="code">6256</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6502,8 +5717,7 @@
       <field name="name">Réceptions</field>
       <field name="code">6257</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_625"/>
     </record>
 
@@ -6511,8 +5725,7 @@
       <field name="name">Frais postaux et frais de télécommunications</field>
       <field name="code">626</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6520,9 +5733,8 @@
       <field name="name">Services bancaires et assimilés</field>
       <field name="code">627</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Frais de tenue de compte, etc</field>
-
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6530,8 +5742,7 @@
       <field name="name">Frais sur titres (achat, vente, garde)</field>
       <field name="code">6271</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6539,8 +5750,7 @@
       <field name="name">Commissions et frais sur émission d'emprunts</field>
       <field name="code">6272</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6548,8 +5758,7 @@
       <field name="name">Frais sur effets</field>
       <field name="code">6275</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6557,8 +5766,7 @@
       <field name="name">Location de coffres</field>
       <field name="code">6276</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6566,8 +5774,7 @@
       <field name="name">Autres frais et commissions sur prestations de services</field>
       <field name="code">6278</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_627"/>
     </record>
 
@@ -6575,8 +5782,7 @@
       <field name="name">Divers</field>
       <field name="code">628</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6584,9 +5790,7 @@
       <field name="name">Concours divers (cotisations...)</field>
       <field name="code">6281</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-      <field name="note">Dont sites internet (hébergement, nom domaine...)</field>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_628"/>
     </record>
 
@@ -6594,8 +5798,7 @@
       <field name="name">Frais de recrutement de personnel</field>
       <field name="code">6284</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_628"/>
     </record>
 
@@ -6603,8 +5806,7 @@
       <field name="name">Rabais, remises et ristournes obtenus sur autres services extérieurs</field>
       <field name="code">629</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_62"/>
     </record>
 
@@ -6612,8 +5814,7 @@
       <field name="name">Impôts, taxes et versements assimilés</field>
       <field name="code">63</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6621,8 +5822,7 @@
       <field name="name">Impôts, taxes et versements assimilés sur rémunérations (administration des impôts) </field>
       <field name="code">631</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6630,8 +5830,7 @@
       <field name="name">Taxe sur les salaires</field>
       <field name="code">6311</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6639,8 +5838,7 @@
       <field name="name">Taxe d'apprentissage</field>
       <field name="code">6312</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6648,8 +5846,7 @@
       <field name="name">Participation des employeurs à la formation professionnelle continue</field>
       <field name="code">6313</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6657,8 +5854,7 @@
       <field name="name">Cotisation pour défaut d'investissement obligatoire dans la construction</field>
       <field name="code">6314</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6666,8 +5862,7 @@
       <field name="name">Autres</field>
       <field name="code">6318</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_631"/>
     </record>
 
@@ -6675,8 +5870,7 @@
       <field name="name">Impôts, taxes et versements assimilés sur rémunérations (autres organismes)</field>
       <field name="code">633</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6684,8 +5878,7 @@
       <field name="name">Versement de transport</field>
       <field name="code">6331</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6693,8 +5886,7 @@
       <field name="name">Allocation logement</field>
       <field name="code">6332</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6702,8 +5894,7 @@
       <field name="name">Participation des employeurs à la formation professionnelle continue</field>
       <field name="code">6333</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6711,8 +5902,7 @@
       <field name="name">Participation des employeurs à l'effort de construction</field>
       <field name="code">6334</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6720,8 +5910,7 @@
       <field name="name">Versements libératoires ouvrant droit à l'exonération de la taxe d'apprentissage</field>
       <field name="code">6335</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6729,8 +5918,7 @@
       <field name="name">Autres</field>
       <field name="code">6338</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_633"/>
     </record>
 
@@ -6738,8 +5926,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés (administration des impôts)</field>
       <field name="code">635</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6747,8 +5934,7 @@
       <field name="name">Impôts directs (sauf impôts sur les bénéfices)</field>
       <field name="code">6351</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6756,8 +5942,7 @@
       <field name="name">Taxe professionnelle</field>
       <field name="code">63511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6765,8 +5950,7 @@
       <field name="name">Taxes foncières</field>
       <field name="code">63512</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6774,8 +5958,7 @@
       <field name="name">Autres impôts locaux</field>
       <field name="code">63513</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6783,8 +5966,7 @@
       <field name="name">Taxe sur les véhicules des sociétés</field>
       <field name="code">63514</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6351"/>
     </record>
 
@@ -6792,8 +5974,7 @@
       <field name="name">Taxes sur le chiffre d'affaires non récupérables </field>
       <field name="code">6352</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6801,8 +5982,7 @@
       <field name="name">Impôts indirects</field>
       <field name="code">6353</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6810,8 +5990,7 @@
       <field name="name">Droits d'enregistrement et de timbre</field>
       <field name="code">6354</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6819,8 +5998,7 @@
       <field name="name">Droits de mutation</field>
       <field name="code">63541</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6354"/>
     </record>
 
@@ -6828,8 +6006,7 @@
       <field name="name">Autres droits</field>
       <field name="code">6358</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_635"/>
     </record>
 
@@ -6837,8 +6014,7 @@
       <field name="name">Autres impôts, taxes et versements assimilés (autres organismes)</field>
       <field name="code">637</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_63"/>
     </record>
 
@@ -6846,8 +6022,7 @@
       <field name="name">Contribution sociale de solidarité à la charge des sociétés</field>
       <field name="code">6371</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6855,8 +6030,7 @@
       <field name="name">Taxes perçues par les organismes publics internationaux</field>
       <field name="code">6372</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6864,8 +6038,7 @@
       <field name="name">Impôts et taxes exigibles à l'étranger</field>
       <field name="code">6374</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6873,8 +6046,7 @@
       <field name="name">Taxes diverses</field>
       <field name="code">6378</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_637"/>
     </record>
 
@@ -6882,8 +6054,7 @@
       <field name="name">Charges de personnel</field>
       <field name="code">64</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -6891,8 +6062,7 @@
       <field name="name">Rémunérations du personnel</field>
       <field name="code">641</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6900,8 +6070,7 @@
       <field name="name">Salaires et appointements</field>
       <field name="code">6411</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6909,8 +6078,7 @@
       <field name="name">Congés payés</field>
       <field name="code">6412</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6918,8 +6086,7 @@
       <field name="name">Primes et gratifications</field>
       <field name="code">6413</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6927,8 +6094,7 @@
       <field name="name">Indemnités et avantages divers</field>
       <field name="code">6414</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6936,8 +6102,7 @@
       <field name="name">Supplément familial</field>
       <field name="code">6415</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_641"/>
     </record>
 
@@ -6945,8 +6110,7 @@
       <field name="name">Rémunération du travail de l'exploitant</field>
       <field name="code">644</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6954,8 +6118,7 @@
       <field name="name">Charges de Sécurité sociale et de prévoyance</field>
       <field name="code">645</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -6963,8 +6126,7 @@
       <field name="name">Cotisations à l'URSSAF</field>
       <field name="code">6451</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6972,8 +6134,7 @@
       <field name="name">Cotisations aux mutuelles</field>
       <field name="code">6452</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6981,8 +6142,7 @@
       <field name="name">Cotisations aux caisses de retraites</field>
       <field name="code">6453</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6990,8 +6150,7 @@
       <field name="name">Cotisations aux ASSEDIC</field>
       <field name="code">6454</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
@@ -6999,17 +6158,15 @@
       <field name="name">Cotisations aux autres organismes sociaux</field>
       <field name="code">6458</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_645"/>
     </record>
 
     <record id="pcg_646" model="account.account.template">
       <field name="name">Cotisations sociales personnelles de l'exploitant</field>
       <field name="code">646</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="type">other</field>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7017,8 +6174,7 @@
       <field name="name">Autres charges sociales</field>
       <field name="code">647</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7026,8 +6182,7 @@
       <field name="name">Prestations directes</field>
       <field name="code">6471</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7035,8 +6190,7 @@
       <field name="name">Versements aux comités d'entreprise et d'établissement</field>
       <field name="code">6472</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7044,8 +6198,7 @@
       <field name="name">Versements aux comités d'hygiène et de sécurité</field>
       <field name="code">6473</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7053,8 +6206,7 @@
       <field name="name">Versements aux autres oeuvres sociales</field>
       <field name="code">6474</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7062,8 +6214,7 @@
       <field name="name">Médecine du travail pharmacie</field>
       <field name="code">6475</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_647"/>
     </record>
 
@@ -7071,8 +6222,7 @@
       <field name="name">Autres charges de personnel</field>
       <field name="code">648</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_64"/>
     </record>
 
@@ -7080,8 +6230,7 @@
       <field name="name">Autres charges de gestion courante</field>
       <field name="code">65</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7089,8 +6238,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">651</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7098,8 +6246,7 @@
       <field name="name">Redevances pour concessions brevets, licences, marques, procédés, logiciels </field>
       <field name="code">6511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7107,8 +6254,7 @@
       <field name="name">Droits d'auteur et de reproduction</field>
       <field name="code">6516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7116,8 +6262,7 @@
       <field name="name">Autres droits et valeurs similaires</field>
       <field name="code">6518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_651"/>
     </record>
 
@@ -7125,8 +6270,7 @@
       <field name="name">Jetons de présence</field>
       <field name="code">653</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7134,9 +6278,8 @@
       <field name="name">Pertes sur créances irrécouvrables</field>
       <field name="code">654</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Faire et conserver les relances et mises en demeures</field>
-
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7144,8 +6287,7 @@
       <field name="name">Créances de l'exercice</field>
       <field name="code">6541</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_654"/>
     </record>
 
@@ -7153,8 +6295,7 @@
       <field name="name">Créances des exercices antérieurs</field>
       <field name="code">6544</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_654"/>
     </record>
 
@@ -7162,8 +6303,7 @@
       <field name="name">Quotes-parts de résultat sur opérations faites en commun</field>
       <field name="code">655</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7171,8 +6311,7 @@
       <field name="name">Quote-part de bénéfice transférée (comptabilité du gérant)</field>
       <field name="code">6551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_655"/>
     </record>
 
@@ -7180,8 +6319,7 @@
       <field name="name">Quote-part de perte supportée (comptabilité des associés non gérants)</field>
       <field name="code">6555</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_655"/>
     </record>
 
@@ -7189,8 +6327,7 @@
       <field name="name">Charges diverses de gestion courante</field>
       <field name="code">658</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_65"/>
     </record>
 
@@ -7198,9 +6335,8 @@
       <field name="name">Charges financières</field>
       <field name="code">66</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Dont les intérêts d'emprunt</field>
-
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7208,8 +6344,7 @@
       <field name="name">Charges d'intérêt</field>
       <field name="code">661</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7217,8 +6352,7 @@
       <field name="name">Intérêts des emprunts et dettes</field>
       <field name="code">6611</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7226,8 +6360,7 @@
       <field name="name">Intérêts des emprunts et dettes assimilées</field>
       <field name="code">66116</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6611"/>
     </record>
 
@@ -7235,8 +6368,7 @@
       <field name="name">Intérêts des dettes rattachées à des participations</field>
       <field name="code">66117</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6611"/>
     </record>
 
@@ -7244,8 +6376,7 @@
       <field name="name">Intérêts des comptes courants et des dépôts créditeurs</field>
       <field name="code">6615</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7253,8 +6384,7 @@
       <field name="name">Intérêts bancaires et sur opérations de financement (escompte, ...)</field>
       <field name="code">6616</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7262,8 +6392,7 @@
       <field name="name">Intérêts des obligations cautionnées</field>
       <field name="code">6617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7271,8 +6400,7 @@
       <field name="name">Intérêts des autres dettes</field>
       <field name="code">6618</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_661"/>
     </record>
 
@@ -7280,8 +6408,7 @@
       <field name="name">Intérêts des dettes commerciales</field>
       <field name="code">66181</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6618"/>
     </record>
 
@@ -7289,8 +6416,7 @@
       <field name="name">Intérêts des dettes diverses</field>
       <field name="code">66188</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6618"/>
     </record>
 
@@ -7298,8 +6424,7 @@
       <field name="name">Pertes sur créances liées à des participations</field>
       <field name="code">664</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7307,8 +6432,7 @@
       <field name="name">Escomptes accordés</field>
       <field name="code">665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7316,8 +6440,7 @@
       <field name="name">Pertes de change</field>
       <field name="code">666</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7325,9 +6448,8 @@
       <field name="name">Charges nettes sur cessions de valeurs mobilières de placement</field>
       <field name="code">667</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">(contrepartie 767)</field>
-
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7335,8 +6457,7 @@
       <field name="name">Autres charges financières</field>
       <field name="code">668</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_66"/>
     </record>
 
@@ -7344,8 +6465,7 @@
       <field name="name">Charges exceptionnelles</field>
       <field name="code">67</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7353,8 +6473,7 @@
       <field name="name">Charges exceptionnelles sur opérations de gestion</field>
       <field name="code">671</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7362,8 +6481,7 @@
       <field name="name">Pénalités sur marchés (et dédits payés sur achats et ventes)</field>
       <field name="code">6711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7371,9 +6489,8 @@
       <field name="name">Pénalités, amendes fiscales et pénales </field>
       <field name="code">6712</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="note">PV code de la route non déductibles</field>
-
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7381,8 +6498,7 @@
       <field name="name">Dons, libéralités</field>
       <field name="code">6713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7390,8 +6506,7 @@
       <field name="name">Créances devenues irrécouvrables dans l'exercice</field>
       <field name="code">6714</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7399,8 +6514,7 @@
       <field name="name">Subventions accordées</field>
       <field name="code">6715</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7408,8 +6522,7 @@
       <field name="name">Rappels d'impôts (autres qu'impôts sur les bénéfices)</field>
       <field name="code">6717</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7417,8 +6530,7 @@
       <field name="name">Autres charges exceptionnelles sur opération de gestion</field>
       <field name="code">6718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_671"/>
     </record>
 
@@ -7426,8 +6538,7 @@
       <field name="name">Charges sur exercices antérieurs (en cours d'exercice seulement)</field>
       <field name="code">672</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7435,9 +6546,8 @@
       <field name="name">Valeurs comptables des éléments d'actif cédés</field>
       <field name="code">675</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Vente d'immobilisation = (Valeur d'origine - amortissements) (contrepartie 775)</field>
-
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7445,8 +6555,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">6751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7454,8 +6563,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">6752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7463,8 +6571,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">6756</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7472,8 +6579,7 @@
       <field name="name">Autres éléments d'actif</field>
       <field name="code">6758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_675"/>
     </record>
 
@@ -7482,8 +6588,7 @@
       <field name="name">Autres charges exceptionnelles</field>
       <field name="code">678</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_67"/>
     </record>
 
@@ -7491,8 +6596,7 @@
       <field name="name">Malis provenant de clauses d'indexation </field>
       <field name="code">6781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7500,8 +6604,7 @@
       <field name="name">Lots</field>
       <field name="code">6782</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7509,8 +6612,7 @@
       <field name="name">Malis provenant du rachat par l'entreprise d'actions et obligations émises par elle-même</field>
       <field name="code">6783</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7518,8 +6620,7 @@
       <field name="name">Charges exceptionnelles diverses</field>
       <field name="code">6788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_678"/>
     </record>
 
@@ -7527,8 +6628,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions</field>
       <field name="code">68</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7536,8 +6636,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges d'exploitation</field>
       <field name="code">681</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7545,8 +6644,7 @@
       <field name="name">Dotations aux amortissements des immobilisations incorporelles et corporelles </field>
       <field name="code">6811</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7554,8 +6652,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">68111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6811"/>
     </record>
 
@@ -7563,8 +6660,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">68112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6811"/>
     </record>
 
@@ -7572,8 +6668,7 @@
       <field name="name">Dotations aux amortissements des charges d'exploitation à répartir</field>
       <field name="code">6812</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7581,8 +6676,7 @@
       <field name="name">Dotations aux provisions pour risques et charges d'exploitation</field>
       <field name="code">6815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7590,8 +6684,7 @@
       <field name="name">Dotations pour dépréciations des immobilisations incorporelles et corporelles</field>
       <field name="code">6816</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7599,8 +6692,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">68161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6816"/>
     </record>
 
@@ -7608,8 +6700,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">68162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6816"/>
     </record>
 
@@ -7617,8 +6708,7 @@
       <field name="name">Dotations aux provisions pour dépréciation des actifs circulants</field>
       <field name="code">6817</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_681"/>
     </record>
 
@@ -7626,8 +6716,7 @@
       <field name="name">Stocks et en-cours</field>
       <field name="code">68173</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6817"/>
     </record>
 
@@ -7635,8 +6724,7 @@
       <field name="name">Créances</field>
       <field name="code">68174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6817"/>
     </record>
 
@@ -7644,8 +6732,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges financières</field>
       <field name="code">686</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7653,8 +6740,7 @@
       <field name="name">Dotations aux amortissements des primes de remboursement des obligations</field>
       <field name="code">6861</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7662,8 +6748,7 @@
       <field name="name">Dotations aux provisions pour risques et charges financiers</field>
       <field name="code">6865</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7671,8 +6756,7 @@
       <field name="name">Dotations aux dépréciation des éléments financiers</field>
       <field name="code">6866</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7680,8 +6764,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">68662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6866"/>
     </record>
 
@@ -7689,8 +6772,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">68665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6866"/>
     </record>
 
@@ -7698,8 +6780,7 @@
       <field name="name">Autres dotations</field>
       <field name="code">6868</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_686"/>
     </record>
 
@@ -7707,8 +6788,7 @@
       <field name="name">Dotations aux amortissements, dépréciations et provisions - Charges exceptionnelles</field>
       <field name="code">687</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_68"/>
     </record>
 
@@ -7716,8 +6796,7 @@
       <field name="name">Dotations aux amortissements exceptionnels des immobilisations</field>
       <field name="code">6871</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7725,8 +6804,7 @@
       <field name="name">Dotations aux provisions réglementées (immobilisations)</field>
       <field name="code">6872</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7734,8 +6812,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">68725</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_6872"/>
     </record>
 
@@ -7743,8 +6820,7 @@
       <field name="name">Dotations aux provisions réglementées (stocks)</field>
       <field name="code">6873</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7752,8 +6828,7 @@
       <field name="name">Dotations aux autres provisions réglementées</field>
       <field name="code">6874</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7761,8 +6836,7 @@
       <field name="name">Dotations aux provisions exceptionnelles</field>
       <field name="code">6875</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7770,8 +6844,7 @@
       <field name="name">Dotations aux dépréciations exceptionnelles</field>
       <field name="code">6876</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_687"/>
     </record>
 
@@ -7779,8 +6852,7 @@
       <field name="name">Participation des salariés - Impôts sur les bénéfices et assimilés</field>
       <field name="code">69</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_6"/>
     </record>
 
@@ -7788,8 +6860,7 @@
       <field name="name">Participation des salariés aux résultats</field>
       <field name="code">691</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7797,8 +6868,7 @@
       <field name="name">Impôts sur les bénéfices</field>
       <field name="code">695</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7806,8 +6876,7 @@
       <field name="name">Impôts dus en France</field>
       <field name="code">6951</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7815,8 +6884,7 @@
       <field name="name">Contribution additionnelle à l'impôt sur les bénéfices</field>
       <field name="code">6952</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7824,8 +6892,7 @@
       <field name="name">Impôts dus à l'étranger</field>
       <field name="code">6954</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_695"/>
     </record>
 
@@ -7833,8 +6900,7 @@
       <field name="name">Supplément d'impôt sur les sociétés lié aux distributions</field>
       <field name="code">696</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7842,8 +6908,7 @@
       <field name="name">Imposition forfaitaire annuelle des sociétés</field>
       <field name="code">697</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7851,8 +6916,7 @@
       <field name="name">Intégration fiscale</field>
       <field name="code">698</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7860,8 +6924,7 @@
       <field name="name">Intégration fiscale - Charges</field>
       <field name="code">6981</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_698"/>
     </record>
 
@@ -7869,8 +6932,7 @@
       <field name="name">Intégration fiscale - Produits</field>
       <field name="code">6989</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_698"/>
     </record>
 
@@ -7878,8 +6940,7 @@
       <field name="name">Produits, Reports en arrière des déficits</field>
       <field name="code">699</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_expense"/>
-
+      <field name="user_type" ref="account.data_account_type_expense"/>
       <field name="parent_id" ref="pcg_69"/>
     </record>
 
@@ -7887,8 +6948,7 @@
       <field name="name">Comptes de produits</field>
       <field name="code">Classe 7</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classes_6_et_7"/>
     </record>
 
@@ -7896,8 +6956,7 @@
       <field name="name">Ventes de produits fabriqués - Prestations de service - Marchandises</field>
       <field name="code">70</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -7905,8 +6964,7 @@
       <field name="name">Ventes de produits finis</field>
       <field name="code">701</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7914,8 +6972,7 @@
       <field name="name">Produits finis (ou groupe) A</field>
       <field name="code">7011</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_701"/>
     </record>
 
@@ -7924,8 +6981,7 @@
       <field name="name">Produits finis (ou groupe) B</field>
       <field name="code">7012</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_701"/>
     </record>
 
@@ -7933,8 +6989,7 @@
       <field name="name">Ventes de produits intermédiaires</field>
       <field name="code">702</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7942,8 +6997,7 @@
       <field name="name">Ventes de produits résiduels</field>
       <field name="code">703</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7951,8 +7005,7 @@
       <field name="name">Travaux</field>
       <field name="code">704</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7960,8 +7013,7 @@
       <field name="name">Travaux de catégorie (ou activité) A</field>
       <field name="code">7041</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_704"/>
     </record>
 
@@ -7969,8 +7021,7 @@
       <field name="name">Travaux de catégorie (ou activité) B</field>
       <field name="code">7042</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_704"/>
     </record>
 
@@ -7978,8 +7029,7 @@
       <field name="name">Études</field>
       <field name="code">705</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7987,8 +7037,7 @@
       <field name="name">Prestations de services</field>
       <field name="code">706</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -7996,9 +7045,8 @@
       <field name="name">Ventes de marchandises</field>
       <field name="code">707</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">707-607 = marge commerciale (contrepartie 607)</field>
-
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8006,8 +7054,7 @@
       <field name="name">Marchandises (ou groupe) A</field>
       <field name="code">7071</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8015,8 +7062,7 @@
       <field name="name">Marchandises (ou groupe) B</field>
       <field name="code">7072</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8024,8 +7070,7 @@
       <field name="name">Marchandises à l'exportation</field>
       <field name="code">7073</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="fr_pcg_sale"/>
     </record>
 
@@ -8033,9 +7078,8 @@
       <field name="name">Produits des activités annexes</field>
       <field name="code">708</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Activité accessoire ou occasionnelle</field>
-
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8043,8 +7087,7 @@
       <field name="name">Produits des services exploités dans l'intérêt du personnel</field>
       <field name="code">7081</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8052,8 +7095,7 @@
       <field name="name">Commissions et courtages</field>
       <field name="code">7082</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8061,8 +7103,7 @@
       <field name="name">Locations diverses</field>
       <field name="code">7083</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8070,8 +7111,7 @@
       <field name="name">Mise à disposition de personnel facturée </field>
       <field name="code">7084</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8079,8 +7119,7 @@
       <field name="name">Ports et frais accessoires facturés</field>
       <field name="code">7085</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8088,8 +7127,7 @@
       <field name="name">Bonis sur reprises d'emballages consignés</field>
       <field name="code">7086</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8097,8 +7135,7 @@
       <field name="name">Bonifications obtenues des clients et primes sur ventes</field>
       <field name="code">7087</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8106,8 +7143,7 @@
       <field name="name">Autres produits d'activités annexes (cessions d'approvisionnements...)</field>
       <field name="code">7088</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_708"/>
     </record>
 
@@ -8115,8 +7151,7 @@
       <field name="name">Rabais, remises et ristournes accordés par l'entreprise</field>
       <field name="code">709</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_70"/>
     </record>
 
@@ -8124,8 +7159,7 @@
       <field name="name">- sur ventes de produits finis</field>
       <field name="code">7091</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8133,8 +7167,7 @@
       <field name="name">- sur ventes de produits intermédiaires </field>
       <field name="code">7092</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8142,8 +7175,7 @@
       <field name="name">- sur travaux</field>
       <field name="code">7094</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8151,8 +7183,7 @@
       <field name="name">- sur études</field>
       <field name="code">7095</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8160,8 +7191,7 @@
       <field name="name">- sur prestations de services</field>
       <field name="code">7096</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8169,8 +7199,7 @@
       <field name="name">- sur ventes de marchandises</field>
       <field name="code">7097</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8178,8 +7207,7 @@
       <field name="name">- sur produits des activités annexes</field>
       <field name="code">7098</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_709"/>
     </record>
 
@@ -8187,8 +7215,7 @@
       <field name="name">Production stockée (ou déstockage)</field>
       <field name="code">71</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8196,8 +7223,7 @@
       <field name="name">Variation des stocks (en-cours de production, produits)</field>
       <field name="code">713</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_71"/>
     </record>
 
@@ -8205,8 +7231,7 @@
       <field name="name">Variation des en-cours de production de biens</field>
       <field name="code">7133</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8214,8 +7239,7 @@
       <field name="name">Produits en cours</field>
       <field name="code">71331</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7133"/>
     </record>
 
@@ -8223,8 +7247,7 @@
       <field name="name">Travaux en cours</field>
       <field name="code">71335</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7133"/>
     </record>
 
@@ -8232,8 +7255,7 @@
       <field name="name">Variation des en-cours de production de services</field>
       <field name="code">7134</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8241,8 +7263,7 @@
       <field name="name">Études en cours</field>
       <field name="code">71341</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7134"/>
     </record>
 
@@ -8250,8 +7271,7 @@
       <field name="name">Prestations de services en cours</field>
       <field name="code">71345</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7134"/>
     </record>
 
@@ -8259,8 +7279,7 @@
       <field name="name">Variation des stocks de produits</field>
       <field name="code">7135</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_713"/>
     </record>
 
@@ -8268,8 +7287,7 @@
       <field name="name">Produits intermédiaires </field>
       <field name="code">71351</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8277,8 +7295,7 @@
       <field name="name">Produits finis</field>
       <field name="code">71355</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8286,8 +7303,7 @@
       <field name="name">Produits résiduels</field>
       <field name="code">71358</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7135"/>
     </record>
 
@@ -8295,8 +7311,7 @@
       <field name="name">Production immobilisée</field>
       <field name="code">72</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8304,8 +7319,7 @@
       <field name="name">Immobilisations incorporelles </field>
       <field name="code">721</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_72"/>
     </record>
 
@@ -8313,8 +7327,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">722</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_72"/>
     </record>
 
@@ -8322,8 +7335,7 @@
       <field name="name">Subventions d'exploitation</field>
       <field name="code">74</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8331,8 +7343,7 @@
       <field name="name">Autres produits de gestion courante</field>
       <field name="code">75</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8340,8 +7351,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires</field>
       <field name="code">751</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8349,8 +7359,7 @@
       <field name="name">Redevances pour concessions, brevets, licences, marques, procédés, logiciels </field>
       <field name="code">7511</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8358,8 +7367,7 @@
       <field name="name">Droits d'auteur et de reproduction</field>
       <field name="code">7516</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8367,8 +7375,7 @@
       <field name="name">Autres droits et valeurs similaires</field>
       <field name="code">7518</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_751"/>
     </record>
 
@@ -8376,8 +7383,7 @@
       <field name="name">Revenus des immeubles non affectés aux activités professionnelles</field>
       <field name="code">752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8385,8 +7391,7 @@
       <field name="name">Jetons de présence et rémunérations d'administrateurs, gérants..</field>
       <field name="code">753</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8394,8 +7399,7 @@
       <field name="name">Ristournes perçues des coopératives (provenant des excédents)</field>
       <field name="code">754</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8403,8 +7407,7 @@
       <field name="name">Quotes-parts de résultats sur opérations faites en commun</field>
       <field name="code">755</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8412,8 +7415,7 @@
       <field name="name">Quote-part de perte transférée (comptabilité du gérant)</field>
       <field name="code">7551</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_755"/>
     </record>
 
@@ -8421,8 +7423,7 @@
       <field name="name">Quote-part de bénéfice attribuée (comptabilité des associés non-gérants)</field>
       <field name="code">7555</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_755"/>
     </record>
 
@@ -8430,8 +7431,7 @@
       <field name="name">Produits divers de gestion courante</field>
       <field name="code">758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_75"/>
     </record>
 
@@ -8439,9 +7439,8 @@
       <field name="name">Produits financiers</field>
       <field name="code">76</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Intérêts sur comptes rémunérés (SICAV....)</field>
-
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8449,8 +7448,7 @@
       <field name="name">Produits de participations</field>
       <field name="code">761</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8458,8 +7456,7 @@
       <field name="name">Revenus des titres de participation</field>
       <field name="code">7611</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8467,8 +7464,7 @@
       <field name="name">Revenus sur autres formes de participation </field>
       <field name="code">7616</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8476,8 +7472,7 @@
       <field name="name">Revenus des créances rattachées à des participations</field>
       <field name="code">7617</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_761"/>
     </record>
 
@@ -8485,8 +7480,7 @@
       <field name="name">Produits des autres immobilisations financières</field>
       <field name="code">762</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8494,8 +7488,7 @@
       <field name="name">Revenus des titres immobilisés</field>
       <field name="code">7621</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8503,8 +7496,7 @@
       <field name="name">Revenus des prêts</field>
       <field name="code">7626</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8512,8 +7504,7 @@
       <field name="name">Revenus des créances immobilisées</field>
       <field name="code">7627</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_762"/>
     </record>
 
@@ -8521,8 +7512,7 @@
       <field name="name">Revenus des autres créances</field>
       <field name="code">763</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8530,8 +7520,7 @@
       <field name="name">Revenus des créances commerciales </field>
       <field name="code">7631</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_763"/>
     </record>
 
@@ -8539,8 +7528,7 @@
       <field name="name">Revenus des créances diverses</field>
       <field name="code">7638</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_763"/>
     </record>
 
@@ -8548,8 +7536,7 @@
       <field name="name">Revenus des valeurs mobilières de placement</field>
       <field name="code">764</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8557,8 +7544,7 @@
       <field name="name">Escomptes obtenus</field>
       <field name="code">765</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8566,8 +7552,7 @@
       <field name="name">Gains de change</field>
       <field name="code">766</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8575,9 +7560,8 @@
       <field name="name">Produits nets sur cessions de valeurs mobilières de placement</field>
       <field name="code">767</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="note">(contrepartie 667)</field>
-
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8585,8 +7569,7 @@
       <field name="name">Autres produits financiers</field>
       <field name="code">768</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_76"/>
     </record>
 
@@ -8594,8 +7577,7 @@
       <field name="name">Produits exceptionnels</field>
       <field name="code">77</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8603,9 +7585,8 @@
       <field name="name">Produits exceptionnels sur opérations de gestion</field>
       <field name="code">771</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">Écarts d'arrondis</field>
-
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8613,8 +7594,7 @@
       <field name="name">Dédits et pénalités perçus sur achats et sur ventes</field>
       <field name="code">7711</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8622,8 +7602,7 @@
       <field name="name">Libéralités reçues</field>
       <field name="code">7713</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8631,8 +7610,7 @@
       <field name="name">Rentrées sur créances amorties</field>
       <field name="code">7714</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8640,8 +7618,7 @@
       <field name="name">Subventions d'équilibre</field>
       <field name="code">7715</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8649,8 +7626,7 @@
       <field name="name">Dégrèvements d'impôts autres qu'impôts sur les bénéfices</field>
       <field name="code">7717</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8658,8 +7634,7 @@
       <field name="name">Autres produits exceptionnels sur opérations de gestion</field>
       <field name="code">7718</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_771"/>
     </record>
 
@@ -8667,8 +7642,7 @@
       <field name="name">Produits sur exercices antérieurs (en cours d'exercice seulement)</field>
       <field name="code">772</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8676,9 +7650,8 @@
       <field name="name">Produits des cessions d'éléments d'actif</field>
       <field name="code">775</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="note">vente d'immobilisation = prix de vente (contrepartie 675)</field>
-
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8686,8 +7659,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">7751</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8695,8 +7667,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">7752</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8704,8 +7675,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">7756</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8713,8 +7683,7 @@
       <field name="name">Autres éléments d'actif</field>
       <field name="code">7758</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_775"/>
     </record>
 
@@ -8722,8 +7691,7 @@
       <field name="name">Quote-part des subventions d'investissement virée au résultat de l'exercice</field>
       <field name="code">777</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8731,8 +7699,7 @@
       <field name="name">Autres produits exceptionnels</field>
       <field name="code">778</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_77"/>
     </record>
 
@@ -8740,8 +7707,7 @@
       <field name="name">Bonis provenant de clauses d'indexation </field>
       <field name="code">7781</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8749,8 +7715,7 @@
       <field name="name">Lots</field>
       <field name="code">7782</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8758,8 +7723,7 @@
       <field name="name">Bonis provenant du rachat par l'entreprise d'actions et d'obligations émises par elle-même</field>
       <field name="code">7783</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8767,8 +7731,7 @@
       <field name="name">Produits exceptionnels divers</field>
       <field name="code">7788</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_778"/>
     </record>
 
@@ -8776,8 +7739,7 @@
       <field name="name">Reprises sur amortissements, dépréciations et provisions</field>
       <field name="code">78</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -8785,8 +7747,7 @@
       <field name="name">Reprises sur amortissements, dépréciations et provisions (à inscrire dans les produits d'exploitation)</field>
       <field name="code">781</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8794,8 +7755,7 @@
       <field name="name">Reprises sur amortissements des immobilisations incorporelles et corporelles </field>
       <field name="code">7811</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8803,8 +7763,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">78111</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7811"/>
     </record>
 
@@ -8812,8 +7771,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">78112</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7811"/>
     </record>
 
@@ -8821,8 +7779,7 @@
       <field name="name">Reprises sur provisions d'exploitation</field>
       <field name="code">7815</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8830,8 +7787,7 @@
       <field name="name">Reprises sur dépréciations des immobilisations corporelles et incorporelles</field>
       <field name="code">7816</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8839,8 +7795,7 @@
       <field name="name">Immobilisations incorporelles</field>
       <field name="code">78161</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7816"/>
     </record>
 
@@ -8848,8 +7803,7 @@
       <field name="name">Immobilisations corporelles</field>
       <field name="code">78162</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7816"/>
     </record>
 
@@ -8857,8 +7811,7 @@
       <field name="name">Reprises sur dépréciations des actifs circulants</field>
       <field name="code">7817</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_781"/>
     </record>
 
@@ -8866,8 +7819,7 @@
       <field name="name">Stocks et en-cours</field>
       <field name="code">78173</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7817"/>
     </record>
 
@@ -8875,8 +7827,7 @@
       <field name="name">Créances</field>
       <field name="code">78174</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7817"/>
     </record>
 
@@ -8884,8 +7835,7 @@
       <field name="name">Reprises sur dépréciations et provisions (à inscrire dans les produits financiers)</field>
       <field name="code">786</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8893,8 +7843,7 @@
       <field name="name">Reprises sur provisions financiers</field>
       <field name="code">7865</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_786"/>
     </record>
 
@@ -8902,8 +7851,7 @@
       <field name="name">Reprises sur dépréciations des éléments financiers</field>
       <field name="code">7866</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_786"/>
     </record>
 
@@ -8911,8 +7859,7 @@
       <field name="name">Immobilisations financières</field>
       <field name="code">78662</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7866"/>
     </record>
 
@@ -8920,8 +7867,7 @@
       <field name="name">Valeurs mobilières de placement</field>
       <field name="code">78665</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7866"/>
     </record>
 
@@ -8929,8 +7875,7 @@
       <field name="name">Reprises sur dépréciations et provisions (à inscrire dans les produits exceptionnels)</field>
       <field name="code">787</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_78"/>
     </record>
 
@@ -8938,8 +7883,7 @@
       <field name="name">Reprises sur provisions réglementées (immobilisations)</field>
       <field name="code">7872</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8947,8 +7891,7 @@
       <field name="name">Amortissements dérogatoires</field>
       <field name="code">78725</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8956,8 +7899,7 @@
       <field name="name">Provision spéciale de réévaluation</field>
       <field name="code">78726</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8965,8 +7907,7 @@
       <field name="name">Plus-values réinvesties</field>
       <field name="code">78727</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_7872"/>
     </record>
 
@@ -8974,8 +7915,7 @@
       <field name="name">Reprises sur provisions réglementées (stocks) </field>
       <field name="code">7873</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8983,8 +7923,7 @@
       <field name="name">Reprises sur autres provisions réglementées </field>
       <field name="code">7874</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -8992,8 +7931,7 @@
       <field name="name">Reprises sur provisions exceptionnelles</field>
       <field name="code">7875</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -9001,8 +7939,7 @@
       <field name="name">Reprises pour dépréciations exceptionnelles</field>
       <field name="code">7876</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_787"/>
     </record>
 
@@ -9010,8 +7947,7 @@
       <field name="name">Transferts de charges</field>
       <field name="code">79</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
+      <field name="user_type" ref="account.data_account_type_view"/>
       <field name="parent_id" ref="pcg_Classe_7"/>
     </record>
 
@@ -9019,8 +7955,7 @@
       <field name="name">Transferts de charges d'exploitation</field>
       <field name="code">791</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
@@ -9028,8 +7963,7 @@
       <field name="name">Transferts de charges financières</field>
       <field name="code">796</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
@@ -9037,8 +7971,7 @@
       <field name="name">Transferts de charges exceptionnelles</field>
       <field name="code">797</field>
       <field name="type">other</field>
-      <field name="user_type" ref="account_type_income"/>
-
+      <field name="user_type" ref="account.data_account_type_income"/>
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 440c182e336..f5358d9dd42 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
-                   <header>
-                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group>
                         <field name="fiscalyear_id"/>
                    </group>
+                   <footer>
+                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index d9f71c2ef3e..9d9b3b91c71 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
-                    <header>
-                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="fiscalyear_id"/>
                     </group>
+                    <footer>
+                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index e5c13e7e4c4..1f60096e815 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
-                   <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
                        <field name="period_id" widget="selection"/>
                    </group>
+                   <footer>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 3b06ea5ce32..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -134,8 +134,8 @@ class lunch_order(osv.osv):
         'product': fields.many2one('lunch.product', 'Product', required=True, \
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
-        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
+        'descript': fields.char('Comment', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 55a59f76762..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="date"/>
-                        <field name="product" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <group>
+                        <group>
+                            <field name="product" on_change="onchange_product(product)"/>
+                            <field name="descript"/>
+                            <field name="price"/>
+                            <field name="category"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="cashmove"/>
+                            <field name="date"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -105,8 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <field name="name"/>
-                    <field name="manager"/>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -145,14 +151,16 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="user_cashmove"/>
-                        <field name="amount"/>
-                        <field name="box"/>
-                        <field name="create_date"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="user_cashmove"/>
+                            <field name="amount"/>
+                            <field name="box"/>
+                            <field name="create_date"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -216,8 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <separator string="Category Related to Products" colspan="4"/>
-                    <field name="name"/>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -250,18 +259,19 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                     <group col="6">
-                          <field name="name"/>
-                          <field name="category_id"/>
-                          <field name="price" />
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                              <field name="active"/>
-                              <separator string="Description" colspan="4" />
-                              <field name="description" nolabel="1" colspan="4" />
-                          </page>
-                     </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="category_id"/>
+                                <field name="price" />
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 287d283e212..eb05c0dc304 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
-                    <header>
-                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>
                     </group>
+                    <footer>
+                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cd96b9765c9..cb10eb57fd0 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
-                    <header>
-                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
                    </group>
+                    <footer>
+                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index ade5b227cc2..282b79539f8 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
-                    <header>
-                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
                          <field name="confirm_cashbox"/>
                    </group>
+                    <footer>
+                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5668709af17..cdcaf4f464d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0f68a548590..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -540,7 +540,11 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+            if (! this.view.datarecord.id ||
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$element.find('.oe_mail_thread').hide();
+                return;
+            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3da63fb1adc..bcc11c4111d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
-                    <header>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -33,6 +28,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 7c26f5486ce..e97ad7445df 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
-                    <header>
-                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
                         <field name="member_price"/>
                     </group>
+                    <footer>
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index ee7f5eeb258..87b180f0aad 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty" version="7.0">
-                    <header>
-                        <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>
                         <newline/>
                         <field name="product_qty"/>
                     </group>
+                    <footer>
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 6ba09ecbdb0..f8aaa7e3c5d 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Print Cost Structure of Product.">
                         <field name="number"/>
                     </group>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 23a51642630..72d0ccfcaa2 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -11,15 +11,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
-                    <header>
-                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Produce">
                         <field name="mode"/>
                         <field name="product_qty" colspan="2"/>
                     </group>    
+                    <footer>
+                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b40be0df0ac..439e180ca3c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select time unit" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <sheet>
                         <group>
                             <field name="time_unit"/>
                             <field name="measure_unit"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index ee0e47e1da3..b90d822121a 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
-                    <header>
-                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                     </group>
+                    <footer>
+                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>         
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18eac5ce89..ca4690df210 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
-                <header>
-                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
                 </group>
-                </form>
+                <footer>
+                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index ce858ab93b6..ac3e2983d30 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-08 02:57+0000\n"
+"PO-Revision-Date: 2012-07-11 05:37+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -765,7 +765,7 @@ msgstr "小計の合計"
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr "受注行"
+msgstr "オーダー行"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index a8a69b2ff69..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </header>
                     <group>
                         <field name="user_id"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index cd556fbb6de..fef823fe403 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -10,14 +10,14 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
-                    <header>
-                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />  
-                    </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>
                     </group>    
+                    <footer>
+                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />  
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index f197daeebff..09005712b78 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
+                    <footer>
                         <button name= "create_returns" string="Return Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 1809c33d20a..55a8404f54b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,18 +17,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
-                    <header>
-                        <button string="Send Invitations"
-                            name="action_create" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>
                     </group>
                     <field name="user_ids"/>
                     <label string="The following text will be included in the welcome email sent to users."/>
                     <field name="message"/>
+                    <footer>
+                        <button string="Send Invitations"
+                            name="action_create" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index de371db211f..5e18892f464 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <header>
-                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
                      <group>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
@@ -23,6 +18,11 @@
                         <field name="date_planned"/>
                         <field name="warehouse_id"/>
                     </group>
+                    <footer>
+                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 6e6b038d9fa..ab98e598a3d 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
+                    <group>
+                        <label string="This wizard will schedule procurements."/>
+                    </group>
+                    <footer>
                         <button name="procure_calculation" string="Compute Procurements"
                             type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
-                    <group>
-                        <label string="This wizard will schedule procurements."/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 340624fc822..5a29959949e 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     </group>
                     <group col="2">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index dc25dc4c7ef..01712a0cedd 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ea29292f445..75882c4f5dd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -155,7 +155,6 @@ class product_pricelist(osv.osv):
 
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')
-        product_template_obj = self.pool.get('product.template')
         product_category_obj = self.pool.get('product.category')
         product_uom_obj = self.pool.get('product.uom')
         supplierinfo_obj = self.pool.get('product.supplierinfo')
@@ -246,7 +245,7 @@ class product_pricelist(osv.osv):
                             price = 0.0
                             if sinfo:
                                 qty_in_product_uom = qty
-                                product_default_uom = product_template_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+                                product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
                                 supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
                                 seller_uom = supplier.product_uom and supplier.product_uom.id or False
                                 if seller_uom and product_default_uom and product_default_uom != seller_uom:
diff --git a/addons/product/product.py b/addons/product/product.py
index a81074aa56e..3cbff880cf9 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -559,8 +559,8 @@ class product_product(osv.osv):
         return False
 
     def _check_ean_key(self, cr, uid, ids, context=None):
-        for product in self.browse(cr, uid, ids, context=context):
-            res = check_ean(product.ean13)
+        for product in self.read(cr, uid, ids, ['ean13'], context=context):
+            res = check_ean(product['ean13'])
         return res
 
     _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index d1a1b4b3a11..dbc57c4f6e7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,11 +10,6 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
                         <field name="qty1"/>
@@ -23,6 +18,11 @@
                         <field name="qty4"/>
                         <field name="qty5"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 26e40b77189..f174c6af445 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
                         <field name="to_date" />
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 5d833ea6b53..48e3c4a8283 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -47,7 +47,6 @@ class sale_order_line(osv.osv):
             item_obj = self.pool.get('product.pricelist.item')
             price_type_obj = self.pool.get('product.price.type')
             product_obj = self.pool.get('product.product')
-            template_obj = self.pool.get('product.template')
             field_name = 'list_price'
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -57,9 +56,7 @@ class sale_order_line(osv.osv):
                     field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
-            product_tmpl_id = product.product_tmpl_id.id
-
-            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
             if uom and uom != product.uom_id.id:
@@ -110,7 +107,6 @@ class account_invoice_line(osv.osv):
             item_obj = self.pool.get('product.pricelist.item')
             price_type_obj = self.pool.get('product.price.type')
             product_obj = self.pool.get('product.product')
-            template_obj = self.pool.get('product.template')
             field_name = 'list_price'
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
@@ -120,9 +116,7 @@ class account_invoice_line(osv.osv):
                     field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
-            product_tmpl_id = product.product_tmpl_id.id
-
-            product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context)
+            product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
             if uom and uom != product.uom_id.id:
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..8e9ece1452f 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project/project.py b/addons/project/project.py
index 487daa834bb..5810f34ad4a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -215,7 +215,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
                         type='many2many', relation='res.users', string='Followers'),
@@ -236,6 +236,7 @@ class project(osv.osv):
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
+        'privacy_visibility': 'public',
     }
 
     # TODO: Why not using a SQL contraints ?
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7dd1cdb9465..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
-                    <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="project_id" on_change="onchange_project_id(project_id)"/>
@@ -30,6 +25,11 @@
                             <field name="state"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 066f15582b4..84436c045a6 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
-                    <header>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Reevaluation Task"/>
                     <group>
                         <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index aa81b9d6c43..ca6a4d5f7a4 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
-                    <header>
-                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                    <footer>
+                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index fcd18045839..6ef4c5b71d2 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 23:10+0000\n"
+"PO-Revision-Date: 2012-07-09 05:11+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -398,7 +398,7 @@ msgstr "プロジェクトの問題"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr "コミュニケーションと履歴"
+msgstr "通信と履歴"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -836,10 +836,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"事象が作成されると、状態はドラフトにセットされます。\n"
-"事象が進行中になると、状態は開くにセットされます。\n"
-"事業が終了すると、状態は完了にセットされます。\n"
-"事象がレビューが必要な場合、状態は保留中にセットされます。"
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8439244d717..0d5c81984ba 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
-                          or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 17779ffa268..8eb9db762dd 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index e3056d29d96..47f4d277089 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-24 16:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-07-11 03:11+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -45,12 +45,12 @@ msgid ""
 "Fill in the timesheet tab of the employee form."
 msgstr ""
 "Холбогдох ажилтанд журнал тодорхойлогдоогүй байна.\n"
-"Ажилтны формын цагийн хуваарь хавтасыг бөглө."
+"Ажилтны формын цагийн хуудас хавтасыг бөглө."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr "Цагийн хуваарийн даалгавар"
+msgstr "Цагийн хуудсын даалгавар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -90,31 +90,33 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"Та төсөлд оноогдсон харилцагчийг устгах боломжгүй, тиймээс идэвхтэй "
+"тэмдэглэгээг арилгахыг зөвлөе!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Цагийн хуудас/Даалгавар цагийн тайлан сарын хэмжээнд"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -122,225 +124,227 @@ msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
 msgstr ""
+"Энд захиалагчийн төсөлтэй холбогдсон гэрээнүүдийг харах болно. Энэ нь "
+"нэхэмжлэх явцыг зөвх хянахад туслана."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Шинжилгээний данс/төсөл"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Даалгаврын цагууд"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Захиалагчийн төслууд"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Шинжилгээний мөр"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Даалгаврын нэхэмжлэл"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Даалгаврын ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Цагийн хуудсын мөрүүд"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:231
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Алдаатай үйлдэл !"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Нэхэмжлэх боломжтой Төсөл"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Шинэчлэх Гэрээнүүд"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Орох/Гарах үйлдлийг төслөөр харах"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Огнооны сараар бүлэглэх"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Даалгавар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Цагийн Хуудсаа Гүйцээ"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "Энэ жилийн даалгаврын цаг"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Захиалагч"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Даалгавар дахь ажил"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Даалгаврын ажлуудын тооцоо"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Цагийн хуудас дахь цагууд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Даалгаврыг шивнэ үү"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Даалгаврын товчоо нь цагийн хуудсын мөр рүү очдог."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийг Үүсгэх"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "Өнгөрсөн сарын ажлын цагууд"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Төсөл"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Нэхэмжлэх өгөгдөл"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Өөрийн даалгавар дээр хичнээн цаг зарцуулснаа оруулна уу"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "Буруу Шинжилгээний Данс  !"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -349,6 +353,8 @@ msgid ""
 "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтас дээр бөглөнө үү."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:54
@@ -357,17 +363,17 @@ msgstr ""
 #: code:addons/project_timesheet/project_timesheet.py:69
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Буруу Тохиргоо !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
@@ -375,57 +381,58 @@ msgstr ""
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
 msgstr ""
+"Хаагдсан эсвэл Цуцлагдсан төлөвтэй Шинжилгээний Дансыг сонгох боломжгүй"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Сар-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Даалгавар дуусмагц харгалзах нэхэмжлэл үүсгэнэ."
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Өөрийн цагийн хуудас"
 
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Харагдац төрлийн данс дээр шинжилгээний мөрийг үүсгэх боломжгүй."
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Даалгаврын Ажлыг Нэхэмжлэх"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:70
@@ -435,15 +442,18 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Холбогдох ажилтан дээр бараа болон барааны ангилалын үзүүлэлтийн данс "
+"тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуудас хавтсыг бөглөнө үү."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Даалгаврын цагууд сарын хэмжээнд"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Цагийн хуудсыг бөглөх"
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 9ece8f0eb04..c15c8e4fe09 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
-                    <header>
-                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
                     </group>
+                    <footer>
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index d82d6f7fb2f..17b1f7eea5f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
-                    <header>
-                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
                         <label string="
@@ -25,6 +20,11 @@ Lines will only be merged if: &#10;
 " colspan="4"/>
                     </group>
                     
+                    <footer>
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index ed6de182f99..aab257827c2 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
-                    <header>
-                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="partner_id"/>
                     </group>
+                    <footer>
+                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index ce410da232e..3d4b5bce6bb 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
-                    <header>
-                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="print_button"/>
                         <field name="open_action"/>
                     </group>
+                    <footer>
+                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0a3ebbe72ac..611389d3d68 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -845,7 +845,8 @@ class sale_order(osv.osv):
             'procure_method': line.type,
             'move_id': move_id,
             'company_id': order.company_id.id,
-            'note': line.notes
+            'note': line.notes,
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])]
         }
 
     def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 835e5aa80cc..ef7546107c2 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
-                <header>
-                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
+                <footer>
+                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 58734caa25b..ad4df1a5193 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
-                    <header>
-                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
                     <group>
@@ -21,6 +16,11 @@
                             string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
                         <field name="domain"/>
                     </group>
+                    <footer>
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -31,11 +31,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
@@ -60,6 +55,11 @@
                             <field name="access_mode"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -70,10 +70,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
-                    <header>
-                        <field name="user_type" invisible="1"/>
-                        <field name="access_mode" invisible="1"/>
-                    </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}"
                         string="An email notification with instructions has been sent to the following people:">
                         <field name="result_line_ids" nolabel="1" mode="tree">
@@ -100,6 +96,10 @@
                                 attrs="{'invisible':[('access_mode','=','readonly')]}"/>
                         </group>
                     </group>
+                    <footer>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </footer>
 
                 </form>
             </field>
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index cd0cc1d2155..524432fd1ce 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-29 23:16+0000\n"
+"PO-Revision-Date: 2012-07-11 05:35+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-01 04:39+0000\n"
-"X-Generator: Launchpad (build 15520)\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:40+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 62fdbb24ca2..e4164ef9e1f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -243,13 +243,16 @@ class product_product(osv.osv):
             child_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', location_ids)])
             location_ids = child_location_ids or location_ids
         
-        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
-        uoms_o = {}
         # this will be a dictionary of the product UoM by product id
         product2uom = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-            uoms_o[product.uom_id.id] = product.uom_id
+        uom_ids = []
+        for product in self.read(cr, uid, ids, ['uom_id'], context=context):
+            product2uom[product['id']] = product['uom_id'][0]
+            uom_ids.append(product['uom_id'][0])
+        # this will be a dictionary of the UoM resources we need for conversion purposes, by UoM id
+        uoms_o = {}
+        for uom in self.pool.get('product.uom').browse(cr, uid, uom_ids, context=context):
+            uoms_o[uom.id] = uom
 
         results = []
         results2 = []
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 9171cbc595e..9a00a6d62ce 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -103,20 +103,14 @@ class stock_change_product_qty(osv.osv_memory):
             self.change_product_qty_send_note(cr, uid, [data.id], context)
         return {}
 
-    def change_product_qty_send_note (self, cr, uid, ids, context=None):
+    def change_product_qty_send_note(self, cr, uid, ids, context=None):
         prod_obj = self.pool.get('product.product')
         location_obj = self.pool.get('stock.location')
-        prod_temp_obj = self.pool.get('product.template')
-        uom_obj = self.pool.get('product.uom')
 
         for data in self.browse(cr, uid, ids, context=context):
-            for location in location_obj.browse(cr, uid, [data.location_id.id], context=context):
-                location_name = location.name
-            for prod in prod_obj.browse(cr, uid, [data.product_id.id], context=context):
-                for prod_temp in prod_temp_obj.browse(cr, uid, [prod.product_tmpl_id.id], context=context):
-                    for uom in uom_obj.browse(cr, uid, [prod_temp.uom_id.id], context=context):
-                        message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity,uom.name,location_name)
-                        prod_obj.message_append_note(cr, uid, [prod.id], body=message, context=context)
+            location_name = location_obj.browse(cr, uid, data.location_id.id, context=context).name
+            message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity, data.product_id.uom_id.name, location_name)
+            prod_obj.message_append_note(cr, uid, [data.product_id.id], body=message, context=context)
 
 stock_change_product_qty()
 
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index dc00fdbe736..e360f5aa025 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
-                    <header>
-                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" />
                         <field name="prodlot_id" />
                     </group>
+                    <footer>
+                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 968a268a5ef..6062c946d07 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
-                  <header>
-                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Change Price"/>
                   <group>
                       <field name="new_price" string="Cost Price"/>
                   </group>
+                  <footer>
+                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ea07955eff2..75a7b13233b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
                       <field name="location_id"/>
                       <field name="recursive"/>
                       <field name="set_stock_zero"/>
                   </group>
+                  <footer>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index d8a808ed5db..5072007f210 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
@@ -45,6 +40,11 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 0dcca2de211..0386e429ee6 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
-                    <header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                    <footer>
                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Merge Inventories" />
-                    <label string="Do you want to merge theses inventories?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 46c55311045..ca294f8ec79 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -36,7 +36,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             context = {}
 
         model = context.get('active_model')
-        if not model or model != 'stock.picking':
+        if not model or 'stock.picking' not in model:
             return []
 
         model_pool = self.pool.get(model)
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 088498292ae..20f05f394fd 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
-                  <header>
-                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel"/>
-                  </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
                       <field name="group"/>
                       <field name="invoice_date" />
                   </group>
+                  <footer>
+                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel"/>
+                  </footer>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index b1f77576392..f0a52933c8a 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
                         <field name="from_date"/>
                         <field name="to_date"/>
                     </group>
                     <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
+                    <footer>
+                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 9655edf49b8..5ecfc9a85a1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <header>
-                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Consume Products">
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
@@ -23,6 +18,11 @@
                         </div>
                         <field name="location_id"/>
                     </group>
+                    <footer>
+                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -42,11 +42,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <header>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
@@ -57,6 +52,11 @@
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -76,9 +76,6 @@
                 <field name="type">form</field>
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
-                    </header>
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -113,6 +110,9 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                    </footer>
                 </form>
                 </field>
             </record>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 497467025b5..3e0699ec3d8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -21,13 +21,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
+                    <footer>
                         <button name="do_partial" string="_Validate" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Products"/>
-                    <field name="move_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c8da4459efa..fdbcabb9ed7 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -16,11 +16,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -36,6 +31,11 @@
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
+                    <footer>
+                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 06e318c295e..5cdad44f681 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -59,16 +59,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
-                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="Provide the quantities of the returned products."/>
                     <group>
                         <field name="product_return_moves"/>
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 573014b7cac..52b182a3f27 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
-                <header>
-                    <button name="split" string="Ok" type="object" class="oe_highlight" />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
                     <field name="quantity"/>
                 </group>
+                <footer>
+                    <button name="split" string="Ok" type="object" class="oe_highlight" />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index db78799f000..e65f378a638 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -9,7 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
-                    <header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
+                    <footer>
                         <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
                         or
                         <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
@@ -17,11 +21,7 @@
                         <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="4">
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
index a6e12ad4bc7..3d43241341d 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines.py
+++ b/addons/stock_planning/wizard/stock_planning_createlines.py
@@ -56,7 +56,6 @@ class stock_planning_createlines(osv.osv_memory):
         planning_obj = self.pool.get('stock.planning')
         mod_obj = self.pool.get('ir.model.data')
         prod_categ_obj = self.pool.get('product.category')
-        template_obj = self.pool.get('product.template')
         planning_lines = []
         for f in self.browse(cr, uid, ids, context=context):
             if f.forecasted_products:
@@ -67,8 +66,7 @@ class stock_planning_createlines(osv.osv_memory):
             else:
                 categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or []
                 prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)])
-                templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
-                products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)])
+                products_id1 = product_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
             if len(products_id1)==0:
                 raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !'))
 
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index e51ab4a3ba0..458994621c1 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
-                    <header>
-                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
@@ -20,6 +15,11 @@
                         <field name="forecasted_products"/>
                         <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py
index 9f73cf257eb..c72ac0599ea 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast.py
+++ b/addons/stock_planning/wizard/stock_planning_forecast.py
@@ -49,13 +49,11 @@ class stock_sale_forecast_createlines(osv.osv_memory):
         forecast_obj = self.pool.get('stock.sale.forecast')
         mod_obj = self.pool.get('ir.model.data')
         prod_categ_obj = self.pool.get('product.category')
-        template_obj = self.pool.get('product.template')
         forecast_lines = []
         for f in self.browse(cr, uid, ids, context=context):
             categ_ids =  f.product_categ_id.id and [f.product_categ_id.id] or []
             prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)])
-            templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
-            products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)])
+            products_ids = product_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
             if len(products_ids) == 0:
                 raise osv.except_osv(_('Error !'), _('No products in selected category !'))
             copy = f.copy_forecast
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 3c31404a070..0f3018350c0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
-                    <header>
-                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -21,6 +16,11 @@
                         <field name="copy_forecast"/>
                         <field name="product_categ_id" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
-    font-size: 12px;
-    border-style:dotted;
-    border-radius: 15px;
-    text-align: left;
-    height:145px;
-    width:220px;
-}
-
-.oe_survey_title{
-    font-size: 15px;
-    height: auto;
-    font-size: 16px;
-    font-weight:bold;
-    width: 205px;
-}
-
 .oe_survey_responsible{
     height: auto;
     width: 200px;
@@ -26,12 +9,6 @@
     width: 200px;
     font-size: 14px;
 }
-
-.oe_survey_fill{
-	align:right;
-	padding: 1px 165px;
-}
-
 .oe_survey_rate{
     font-size: 14px;
 }
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'color': fields.integer('Color Index'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
@@ -177,7 +178,7 @@ class survey_page(osv.osv):
     _columns = {
         'title': fields.char('Page Title', size=128, required=1),
         'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
         'sequence': fields.integer('Page Nr'),
         'note': fields.text('Description'),
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 01e7de66a3e..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,189 +26,206 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                    <group col="6" colspan="6">
-                    <field name="title"/>
-                        <field name="responsible_id"/>
-                        <field name="id" invisible="1"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-                    </group>
-                    <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
-                                <form string="Survey Page">
-                                    <field name="title"/>
-                                    <field name="sequence" groups="base.group_no_one"/>
-                                    <separator string="Description" colspan="4"/>
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                    <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
-                                        <form string="Survey Question" >
-                                            <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4"/>
-                                            <field name="sequence"/>
-                                            <field name="tot_resp"/>
-                                            <field name="type" on_change="on_change_type(type)"/>
-                                            <field name="in_visible_rating_weight" invisible="1"/>
-                                            <field name="in_visible_menu_choice" invisible="1"/>
-                                            <field name="in_visible_answer_type" invisible="1"/>
-                                            <notebook colspan="4">
-                                                <page string="Options">
-                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                                      <separator string="Answer" colspan="4"/>
-                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                                       </group>
-                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                                               <field name="no_of_rows"/>
-                                                            </group>
-                                                       </group>
+                    <div class="oe_button_box oe_right">
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                    </div>
+                    <label for="title" class="oe_edit_only"/>
+                    <h1>
+                        <field name="title" select="1" class="oe_inline"/>
+                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
+                        <field name="type" class="oe_inline"/>
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="id" invisible="1"/>
+                            <field name="responsible_id" class="oe_inline"/>
+                            <field name="send_response"/>
+                        </group>
+                        <group>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        </group>
+                     </group>
+                     <notebook>
+                        <page string="Survey Details">
+                            <field name="note" colspan="4" placeholder="Survey description..."/>
+                            <label for="page_ids"/>
+                            <field name="page_ids" colspan="4" mode="tree">
+                                <form string="Survey Page" version="7.0">
+                                    <sheet>
+                                    <label for="title" class="oe_edit_only"/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
+                                    <group>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
+                                    </group>
+                                    <newline/>
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
+                                        <field name="question_ids" nolabel="1">
+                                            <form string="Survey Question">
+                                                <group>
+                                                    <group>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                                        <separator string="Comment Field" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_comment_require"/>
-                                                        </group>
-                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                                            <group col="4" colspan="4">
-                                                                <field name="comment_field_type" colspan="1"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                    <field colspan="2" name="comment_label" />
+                                                </group>
+                                                <newline/>
+                                                <group>
+                                                <field name="in_visible_rating_weight" invisible="1"/>
+                                                <field name="in_visible_menu_choice" invisible="1"/>
+                                                <field name="in_visible_answer_type" invisible="1"/>
+                                                <notebook colspan="4">
+                                                    <page string="Options">
+                                                        <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer">
+                                                           <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                               <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                           </group>
+                                                           <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                               <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                                   <field name="no_of_rows"/>
                                                                 </group>
-                                                            </group>
-                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                <field name="comment_valid_type" colspan="2"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                                    <field name="comment_minimum_no" string="Between"/>
-                                                                    <field name="comment_maximum_no" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                                    <field name="comment_minimum_float" string="Between"/>
-                                                                    <field name="comment_maximum_float" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                                    <field name="comment_minimum_date" string="Between"/>
-                                                                    <field name="comment_maximum_date" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                                                </group>
-                                                            </group>
+                                                           </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                                        <field name="comment_column"/>
-                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                                            <field name="column_name" colspan="2"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                                        <separator string="Validation" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_validation_require"/>
-                                                        </group>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                                            <field name="validation_type" colspan="2"/>
-                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                                <field name="validation_minimum_no" string="Between"/>
-                                                                <field name="validation_maximum_no" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                                <field name="validation_minimum_float" string="Between"/>
-                                                                <field name="validation_maximum_float" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                                <field name="validation_minimum_date" string="Between"/>
-                                                                <field name="validation_maximum_date" string="and"/>
-                                                            </group>
-                                                        </group>
-                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                        <separator string="Required Answer" colspan="4"/>
                                                         <newline/>
-                                                        <field name="is_require_answer"/>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                                <field name="required_type"/>
-                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                                    <field name="req_ans" />
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                                    <field name="minimum_req_ans"/>
-                                                                    <field name="maximum_req_ans"/>
-                                                                </group>
+                                                        <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                            <separator string="Comment Field" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_comment_require"/>
                                                             </group>
-                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                                <label string="When the question is not answered, display this error message:"/>
-                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                                <group colspan="2" >
-                                                                    <field name="numeric_required_sum"/>
+                                                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                                <group col="4" colspan="4">
+                                                                    <field name="comment_field_type" colspan="1"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                        <field colspan="2" name="comment_label" />
+                                                                    </group>
+                                                                </group>
+                                                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field name="comment_valid_type" colspan="2"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                        <field name="comment_minimum_no" string="Between"/>
+                                                                        <field name="comment_maximum_no" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                        <field name="comment_minimum_float" string="Between"/>
+                                                                        <field name="comment_maximum_float" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                        <field name="comment_minimum_date" string="Between"/>
+                                                                        <field name="comment_maximum_date" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                    </group>
                                                                 </group>
-                                                                <newline/>
-                                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                                <field name="rating_allow_one_column_require"/>
                                                             </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                                        <separator string="Descriptive Text" colspan="4"/>
-                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                                    </group>
-                                                </page>
-                                            </notebook>
-                                            </group>
-                                        </form>
-                                        <tree string="Survey Question">
-                                            <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4"/>
-                                            <field name="answer_choice_ids"/>
-                                        </tree>
-                                    </field>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Other">
-                            <group colspan="6" col='4'>
-                                <field name="max_response_limit"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="type"/>
-                                <field name="send_response"/>
-                            </group>
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                            <field name="comment_column"/>
+                                                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                                <field name="column_name" colspan="2"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                            <separator string="Validation" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_validation_require"/>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                                <field name="validation_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                    <field name="validation_minimum_no" string="Between"/>
+                                                                    <field name="validation_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="validation_minimum_float" string="Between"/>
+                                                                    <field name="validation_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                    <field name="validation_minimum_date" string="Between"/>
+                                                                    <field name="validation_maximum_date" string="and"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                            <separator string="Required Answer" colspan="4"/>
+                                                            <newline/>
+                                                            <field name="is_require_answer"/>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                    <field name="required_type"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                        <field name="req_ans" />
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                        <field name="minimum_req_ans"/>
+                                                                        <field name="maximum_req_ans"/>
+                                                                    </group>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                    <label string="When the question is not answered, display this error message:"/>
+                                                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                    <group colspan="2" >
+                                                                        <field name="numeric_required_sum"/>
+                                                                    </group>
+                                                                    <newline/>
+                                                                    <label string="When the choices do not add up correctly, display this error message"/>
+                                                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                    <field name="rating_allow_one_column_require"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                            <separator string="Descriptive Text" colspan="4"/>
+                                                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                        </group>
+                                                    </page>
+                                                </notebook>
+                                                </group>
+                                            </form>
+                                            <tree string="Survey Question">
+                                                <field name="sequence" string="Seq"/>
+                                                <field name="question"/>
+                                                <field name="answer_choice_ids"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    </sheet>
+                                    </form>
+                                </field>
                         </page>
                         <page string="Invited User">
-                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                            <field name="invited_user_ids" readonly="1"/>
                         </page>
                         <page string="History">
-                            <field name="date_open"/>
-                            <field name="date_close"/>
-                            <field name="tot_start_survey"/>
-                            <field name="tot_comp_survey"/>
-                            <field name="history" colspan="4" nolabel="1">
+                            <group>
+                                <group>
+                                    <field name="date_open"/>
+                                    <field name="date_close"/>
+                                </group>
+                                <group>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
+                                </group>
+                            </group>
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -217,8 +234,8 @@
                                     <field name="date"/>
                                     <field name="user_id"/>
                                 </form>
-                               </field>
-                           </page>
+                           </field>
+                        </page>
                     </notebook>
                 </sheet>
                 </form>
@@ -286,32 +303,37 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                          <div class="oe_module_survey">
-                            <a class="oe_module_icon">
-                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
-                               <div class="oe_survey_responsible">
-                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                               </div><br/>
-                               <div class="oe_survey_start_date">
-                                  Open From:
-                                   <t t-if="record.date_open.raw_value">
-                                       <t t-esc="record.date_open.raw_value.getDate()"/>
-                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
-                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                   </t>
-                               </div><br/>
-                               <div class="oe_survey_rate">
-                                   Rate:
-    							<div class="oe_survey_fill" >
-                                   <button type="object" name="fill_survey" class="">
-                                       <span>Fill</span>
-                                   </button>
-                               </div>                                   
-                               </div>
-                            </a>
-                          </div>  
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit">Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"><field name="title"/></t></h3>
+                                    <div class="oe_survey_responsible">
+                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                                   </div><br/>
+                                   <div class="oe_survey_start_date">
+                                       <t t-if="record.date_open.raw_value">
+                                           Opened at
+                                           <t t-esc="record.date_open.raw_value.getDate()"/>
+                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                       </t>
+                                   </div><br/>
+                                   <div class="oe_survey_rate">
+                                       Rate:
+                                        <a name="fill_survey" type="object">Fill</a>
+                                   </div>
+                                </div>
+                            </div>
                         </t>
                     </templates>
                 </kanban>
@@ -344,149 +366,163 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4"/>
-                        <field name="survey_id"/>
-                        <field name="sequence"/>
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="question_ids" colspan="4" nolabel="1">
-                        <form string="Survey Question">
-                            <field name="question" colspan="4"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
-                            <field name="tot_resp"/>
-                            <field name="type" on_change="on_change_type(type)"/>
-                            <field name="in_visible_rating_weight" invisible="1"/>
-                            <field name="in_visible_menu_choice" invisible="1"/>
-                            <field name="in_visible_answer_type" invisible="1"/>
-                            <notebook colspan="4">
-                                <page string="Options">
-                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                      <separator string="Answer" colspan="4"/>
-                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                       </group>
-                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                               <field name="no_of_rows"/>
-                                            </group>
-                                       </group>
+                        </group>
+                        <group colspan="4">
+                            <field name="note" nolabel="1" placeholder="Description on the survey page..."/>
+                        </group>
+                        <group col="4">
+                            <label for="question_ids"/>
+                            <newline/>
+                            <field name="question_ids" nolabel="1">
+                            <form string="Survey Question">
+                                <group>
+                                    <group>
+                                        <field name="question" select="1"/>
+                                        <field name="type" on_change="on_change_type(type)"/>
+                                    </group>
+                                    <group>
+                                        <field name="sequence" invisible="1"/>
+                                        <field name="tot_resp" invisible="1"/>
+                                        <field name="in_visible_rating_weight" invisible="1"/>
+                                        <field name="in_visible_menu_choice" invisible="1"/>
+                                        <field name="in_visible_answer_type" invisible="1"/>
                                     </group>
                                     <newline/>
-                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                        <separator string="Comment Field" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_comment_require"/>
-                                        </group>
-                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                            <group col="4" colspan="4">
-                                                <field name="comment_field_type" colspan="1"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                    <field colspan="2" name="comment_label" />
+                                    <notebook colspan="4">
+                                        <page string="Options">
+                                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer" col="4">
+                                               <group attrs="{'invisible':[('type','=','table')]}">
+                                                   <field name="answer_choice_ids" nolabel="1" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                               </group>
+                                               <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                   <field name="column_heading_ids" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                    <group attrs="{'invisible':[('type','!=','table')]}">
+                                                       <field name="no_of_rows"/>
+                                                    </group>
+                                               </group>
+                                            </group>
+                                            <newline/>
+                                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}" string="Comment Field" col="4">
+                                                <group>
+                                                    <field name="is_comment_require"/>
+                                                </group>
+                                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                    <group>
+                                                        <field name="comment_field_type" colspan="1"/>
+                                                        <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="comment_label" />
+                                                        </group>
+                                                    </group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                             </group>
-                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field name="comment_valid_type" colspan="2"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                    <field name="comment_minimum_no" string="Between"/>
-                                                    <field name="comment_maximum_no" string="and"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                <field name="comment_column"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                    <field name="column_name" colspan="2"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                    <field name="comment_minimum_float" string="Between"/>
-                                                    <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                <separator string="Validation" colspan="4"/>
+                                                <group colspan="4">
+                                                    <field name="is_validation_require"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                    <field name="comment_minimum_date" string="Between"/>
-                                                    <field name="comment_maximum_date" string="and"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                    <field name="validation_type" colspan="2"/>
+                                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                        <field name="validation_minimum_no" string="Between"/>
+                                                        <field name="validation_maximum_no" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                        <field name="validation_minimum_float" string="Between"/>
+                                                        <field name="validation_maximum_float" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                        <field name="validation_minimum_date" string="Between"/>
+                                                        <field name="validation_maximum_date" string="and"/>
+                                                    </group>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
                                                     <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                                 </group>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                        <field name="comment_column"/>
-                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                            <field name="column_name" colspan="2"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                        <separator string="Validation" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_validation_require"/>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                            <field name="validation_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                <field name="validation_minimum_no" string="Between"/>
-                                                <field name="validation_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                <field name="validation_minimum_float" string="Between"/>
-                                                <field name="validation_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                <field name="validation_minimum_date" string="Between"/>
-                                                <field name="validation_maximum_date" string="and"/>
-                                            </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                        <separator string="Required Answer" colspan="4"/>
-                                        <newline/>
-                                        <field name="is_require_answer"/>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                <field name="required_type"/>
-                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                    <field name="req_ans" />
-                                                </group>
-                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                    <field name="minimum_req_ans"/>
-                                                    <field name="maximum_req_ans"/>
-                                                </group>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                <label string="When the question is not answered, display this error message:"/>
-                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                <group colspan="2" >
-                                                    <field name="numeric_required_sum"/>
-                                                </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <separator string="Required Answer" colspan="4"/>
                                                 <newline/>
-                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                <field name="is_require_answer"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <label string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2">
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                <field name="rating_allow_one_column_require"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                <separator string="Descriptive Text" colspan="4"/>
+                                                <field name="descriptive_text" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                        <separator string="Descriptive Text" colspan="4"/>
-                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                </page>
-                            </notebook>
-    
-                        </form>
-                        <tree string="Survey Question">
-                            <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4"/>
-                            <field name="answer_choice_ids"/>
-                        </tree>
-                        </field>
+                                        </page>
+                                    </notebook>
+                                </group>
+                            </form>
+                            <tree string="Survey Question">
+                                <field name="sequence" string="Seq"/>
+                                <field name="question"/>
+                                <field name="answer_choice_ids"/>
+                            </tree>
+                            </field>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 29cdd4ad5fb..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -18,7 +18,6 @@
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
-                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group string="Select Survey">
+                    <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
-                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 45c4ba6a487..213ca9dd2e2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Menu Information">
                         <field name="menu_name" />
                         <field name="menu_parent_id" />
                     </group>
+                    <footer>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index c818721c09c..90139c3afac 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -10,13 +10,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
+                    <separator string="Menu Information"/>
+                    <label string="Want to create a Index on Selected Pages ? "/>
+                    <footer>
                         <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Menu Information"/>
-                    <label string="Want to create a Index on Selected Pages ? "/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index c5b3583b1e5..4729586c858 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -10,11 +10,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Notes"/>
                     <field name="file_path" width="300"/>
+                    <footer>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 9be2d4d22aa..49f333e453f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Page" version="7.0">
-                    <header>
+                    <label string="Want to open a wiki page? "/>
+                    <footer>
                         <button name="open_wiki_page" string="Open Wiki Page" type="object"  class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Want to open a wiki page? "/>
+                    </footer>
              </form>
             </field>
         </record>