From c9f3b0f46a833adb32e11ccdddd03c2fc9afcbfc Mon Sep 17 00:00:00 2001
From: florian da Costa <florian.dacosta@akretion.com.br>
Date: Mon, 27 Feb 2012 16:06:20 -0300
Subject: [PATCH 01/42] [FIX] fixed sale order line properties not copied in
 procurement bug

lp bug: https://launchpad.net/bugs/926107 fixed

bzr revid: florian.dacosta@akretion.com.br-20120227190620-ltdpop07hggjc9lb
---
 addons/sale/sale.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 82bfda7b580..5dca3d432f0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -720,7 +720,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):

From 5ba6b775acbedf74eac34fa1bc52a809585e96ff Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 8 May 2012 19:02:10 +0530
Subject: [PATCH 02/42] [IMP] Image displayed in kanban.

bzr revid: bth@tinyerp.com-20120508133210-hs3ku34n957fkxvk
---
 addons/web_kanban/static/src/js/kanban.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 928a06d8ba2..f402573b4fc 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -581,10 +581,14 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     },
     kanban_image: function(model, field, id) {
         id = id || '';
-        var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
-        if (this.record.__last_update && this.record.__last_update.raw_value) {
-            var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
-            url += '&t=' + time;
+        if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) {
+            url = 'data:image/png;base64,' + this.record[field].value;
+        }else{
+            var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
+            if (this.record.__last_update && this.record.__last_update.raw_value) {
+                var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
+                url += '&t=' + time;
+            }
         }
         return url;
     },

From 4afcce3a4722cddef89a1548cfd406960f8e9c23 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <>
Date: Mon, 21 May 2012 11:57:36 +0530
Subject: [PATCH 03/42] [FIX] the problem of Empty list of journals when trying
 to create invoice from picking

lp bug: https://launchpad.net/bugs/1001806 fixed

bzr revid: rmu@tinyerp.com-20120521062736-qkd3d20k0pxzn2l8
---
 addons/stock/wizard/stock_invoice_onshipping.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

From 70b78feb630a35f34312229fbd3e7ea805fc9bed Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Fri, 22 Jun 2012 11:44:47 +0530
Subject: [PATCH 04/42] [IMP] Improved kanban_image for o2m list(e.g. contacts
 of company).

bzr revid: jra@tinyerp.com-20120622061447-kszcg6tq9q5qjctr
---
 addons/web_kanban/static/src/js/kanban.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 6811953465d..483f84aa3c5 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -718,6 +718,9 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             // Set the cache duration in seconds.
             url += '&cache=' + parseInt(cache, 10);
         }
+        if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) {
+            url = 'data:image/png;base64,' + this.record[field].value;
+        }
         return url;
     },
     kanban_text_ellipsis: function(s, size) {

From 07e5b120e608f43973c7250b831800ca637d2e5b Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 22 Jun 2012 17:16:01 +0530
Subject: [PATCH 05/42] [IMP] improved the view of project related modules

bzr revid: bde@tinyerp.com-20120622114601-58ivi12560qpw51l
---
 addons/project/project_view.xml                    |  2 +-
 addons/project_issue/project_issue_view.xml        |  5 ++++-
 .../project_issue_sheet_view.xml                   | 14 +++++++++-----
 .../project_long_term/project_long_term_view.xml   |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f883f007bd6..f6c72655a41 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -361,10 +361,10 @@
                     <group>
                         <group>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2b93cfec105..5b48fc8d987 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -90,7 +90,6 @@
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
                             <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                            <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
                     <field name="description" placeholder="Add a description..." />
@@ -111,6 +110,10 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
+                            <group colspan="4" col="4">
+                                <separator string="State" colspan="4"/>
+                                <field name="state" groups="base.group_no_one"/>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2a98f186922..d883fadf2d9 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -10,11 +10,15 @@
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
-                <xpath expr="//notebook" position="before">
-                    <field name="analytic_account_id"
-                        domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
-                        on_change='on_change_account_id(analytic_account_id)'/>
-                </xpath>
+                <field name="active" position="after">
+                    <separator string="Analytic Account" colspan="4"/>
+                    <newline/>
+                    <group colspan="4" col="4"> 
+                        <field name="analytic_account_id"
+                            domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+                            on_change='on_change_account_id(analytic_account_id)'/>
+                    </group>
+                </field>
                 <xpath expr="//notebook/page[@string='Extra Info']" position="before">
                     <page string="Worklogs">
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18babab66a4..8750c98728f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -212,7 +212,7 @@
                                     <field name="sequence"/>
                                 </group>
                             </group>
-                           <separator string="Force Assigned Users"/>
+                           <h2><label string="Force Assigned Users"/></h2> 
                            <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
@@ -325,7 +325,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='effective_hours']" position="after">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="phase_id" context="{'default_project_id' : project_id}"/>
                 </xpath>
             </field>

From 3ed27adc6d269e7a911d54f97f91def721a9be48 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Fri, 22 Jun 2012 18:55:36 +0530
Subject: [PATCH 06/42] [IMP] improved views of project module under
 configuration wizard

bzr revid: bde@tinyerp.com-20120622132536-3ig2s3zwm0n1x06n
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 addons/resource/resource_view.xml       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index edfff777c3e..31d30fc1d94 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -449,8 +449,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
-                <field name="date_to" position="after">
-                    <field name="holiday_id"/>
+                <field name="name" position="after">
+                    <field name="holiday_id" string="Leave Request"/>
                 </field>
             </field>
         </record>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4da1a465c42..f3c7deaa994 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -117,7 +117,7 @@
             <field name="model">resource.calendar.attendance</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Working Time">
+                <tree string="Working Time" editable="top">
                     <field name="name"/>
                     <field name="dayofweek"/>
                     <field name="hour_from" widget="float_time" />
@@ -229,12 +229,12 @@
                            <field name="name" string="Reason"/>
                        </group>
                        <group>
-                           <field name="date_from"/>
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group>
-                           <field name="date_to"/>
+                       <group col="4">
+                       <field name="date_from" string="Duration"/>
+                       <field name="date_to" nolabel="1"/>
                        </group>
                    </group>
                    </sheet>

From 83d2af86765314ee40dac91a7dbc0e1f0f4a3414 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 25 Jun 2012 13:00:40 +0530
Subject: [PATCH 07/42] [IMP] improved view for date fields

bzr revid: bde@tinyerp.com-20120625073040-mtdcgxi9tkjqg0a1
---
 addons/resource/resource_view.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f3c7deaa994..003bbd8810c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -120,8 +120,8 @@
                 <tree string="Working Time" editable="top">
                     <field name="name"/>
                     <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time" />
-                    <field name="hour_to" widget="float_time" />
+                    <field name="hour_from" widget="float_time"/>
+                    <field name="hour_to" widget="float_time"/>
                 </tree>
             </field>
         </record>
@@ -132,11 +132,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <field name="date_from"/>
-                    <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
+                    <group colspan="4"> 
+                        <field name="name"/>
+                        <field name="date_from"/>
+                        <field name="dayofweek"/>
+                        <label for="hour_from" string="Hours"/>
+                        <div>
+                            <field name="hour_from" widget="float_time"/>-
+                            <field name="hour_to" widget="float_time"/>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
@@ -232,9 +237,12 @@
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group col="4">
-                       <field name="date_from" string="Duration"/>
-                       <field name="date_to" nolabel="1"/>
+                       <group col="2" colspan="4">
+                           <label for="date_from" string="Duration"/> 
+                           <div>
+                               <field name="date_from" nolabel="1"/> - 
+                               <field name="date_to" nolabel="1"/>
+                           </div>
                        </group>
                    </group>
                    </sheet>

From 2cd6293c0ba1a4e952297e32ccd1de9affb2ac05 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 27 Jun 2012 17:53:13 +0530
Subject: [PATCH 08/42] [REM]: Remove string from resource xml file for Working
 TIme

bzr revid: atp@tinyerp.com-20120627122313-0ysw8fqrmwc1jnoj
---
 addons/resource/resource_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f6e0eca9eb5..067c3b5cae2 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -211,7 +211,7 @@
                     <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
-                    <field name="calendar_id" string="Working Period"/>
+                    <field name="calendar_id"/>
                     <field name="time_efficiency"/>
                 </tree>
             </field>
@@ -244,7 +244,7 @@
                            </div>
                        </group>
                        <group>
-                           <field name="calendar_id" string="Working Period"/>
+                           <field name="calendar_id"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                     </group>

From 0e77215c1b19b53a93a41826b3ced78345f1c0f0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 27 Jun 2012 18:36:32 +0530
Subject: [PATCH 09/42] [FIX]: Hours in same line

bzr revid: atp@tinyerp.com-20120627130632-297u2vzg40srtwkf
---
 addons/resource/resource_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 067c3b5cae2..4b9be764279 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -141,8 +141,8 @@
                         <field name="dayofweek"/>
                         <label for="hour_from" string="Hours"/>
                         <div>
-                            <field name="hour_from" widget="float_time"/> - 
-                            <field name="hour_to" widget="float_time"/>
+                            <field name="hour_from" widget="float_time" class="oe_inline"/> - 
+                            <field name="hour_to" widget="float_time" class="oe_inline"/>
                         </div>
                     </group>
                 </form>

From 86ef8d586c66cc00be1a12dede071e8cee9166f1 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 28 Jun 2012 14:19:03 +0530
Subject: [PATCH 10/42] [IMP] improved some views of project module

bzr revid: bde@tinyerp.com-20120628084903-7clyjhob6n6mm9dr
---
 addons/project_issue/project_issue_view.xml   |  4 +-
 .../project_issue_sheet_view.xml              |  3 +-
 addons/resource/resource.py                   |  4 +-
 addons/resource/resource_view.xml             | 40 ++++++++++---------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0d8e320c5cb..fe44be8ab17 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -112,8 +112,8 @@
                                 <field name="active"/>
                             </group>
                             <group colspan="4" col="4">
-                                <separator string="State" colspan="4"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <separator string="Status" colspan="4"/>
+                                <field name="state" groups="base.group_no_one" string="Status"/>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index d883fadf2d9..cb2d1f70c96 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -11,9 +11,8 @@
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
                 <field name="active" position="after">
-                    <separator string="Analytic Account" colspan="4"/>
                     <newline/>
-                    <group colspan="4" col="4"> 
+                    <group colspan="4"> 
                         <field name="analytic_account_id"
                             domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
                             on_change='on_change_account_id(analytic_account_id)'/>
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index c399e0333b0..9a7fadc4c82 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -262,8 +262,8 @@ class resource_calendar_attendance(osv.osv):
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
         'date_from' : fields.date('Starting Date'),
-        'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from", select=True),
-        'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
+        'hour_from' : fields.float('Work from', size=8, required=True, help="Start and End time of working.", select=True),
+        'hour_to' : fields.float("Work to", size=8, required=True),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
     
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4b9be764279..4dde2ca4860 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -125,6 +125,7 @@
                     <field name="dayofweek"/>
                     <field name="hour_from" widget="float_time"/>
                     <field name="hour_to" widget="float_time"/>
+                    <field name="date_from"/>
                 </tree>
             </field>
         </record>
@@ -139,7 +140,7 @@
                         <field name="name"/>
                         <field name="date_from"/>
                         <field name="dayofweek"/>
-                        <label for="hour_from" string="Hours"/>
+                        <label for="hour_from" string="Hours" help="Start and End time of working"/>
                         <div>
                             <field name="hour_from" widget="float_time" class="oe_inline"/> - 
                             <field name="hour_to" widget="float_time" class="oe_inline"/>
@@ -232,26 +233,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
-                   <sheet>
-                    <group>
-                       <group>
-                           <field name="resource_id" on_change="onchange_resource(resource_id)"/>
-                           <field name="name" string="Reason"/>
-                           <label for="date_from" string="Duration"/> 
-                           <div>
-                               <field name="date_from" nolabel="1"/> - 
-                               <field name="date_to" nolabel="1"/>
-                           </div>
-                       </group>
-                       <group>
-                           <field name="calendar_id"/>
-                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       </group>
-                    </group>
-                   </sheet>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+                                <field name="name" string="Reason"/>
+                            </group>
+                            <group>
+                                <field name="calendar_id" string="Working Period"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
+                            <group col="2" colspan="4">
+                                <label for="date_from" string="Duration"/> 
+                                <div>
+                                    <field name="date_from" class="oe_inline"/>- 
+                                    <field name="date_to" class="oe_inline"/>
+                                </div>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
+        
         <record id="resource_calendar_leave_tree" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.tree</field>
             <field name="model">resource.calendar.leaves</field>

From 2c15ec669b643839f8aa6401ed9e1f1346305763 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 28 Jun 2012 18:42:57 +0530
Subject: [PATCH 11/42] [FIX]: Change working period to working time

bzr revid: atp@tinyerp.com-20120628131257-bam9eikjhm25fdyk
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 2c2c60dfdf2..8e4456b10fd 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -240,7 +240,7 @@
                                 <field name="name" string="Reason"/>
                             </group>
                             <group>
-                                <field name="calendar_id" string="Working Period"/>
+                                <field name="calendar_id"/>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </group>

From 9e952c3fba9b4f0cd6399d3ba24f17e98b6f0560 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 2 Jul 2012 17:49:27 +0530
Subject: [PATCH 12/42] [IMP]implement css and collapse all functionality.

bzr revid: vme@tinyerp.com-20120702121927-wbg5pncvw4qo8cni
---
 addons/web/static/src/css/base.css    | 50 +++++++++++++++++++++++++++
 addons/web/static/src/css/base.sass   | 40 +++++++++++++++++++++
 addons/web/static/src/js/view_tree.js | 26 +++++++++-----
 addons/web/static/src/xml/base.xml    | 14 ++++----
 4 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8df712d88d1..54284aa6be8 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2215,6 +2215,56 @@
   color: #333333;
 }
 
+.openerp .tree_header {
+  background-color: #f0f0f0;
+  border-bottom: 1px solid #cacaca;
+  color: #4c4c4c;
+  padding: 5px;
+}
+.openerp .tree_header button {
+  float: right;
+}
+.openerp .oe-treeview-table {
+  width: 100%;
+  background-color: white;
+  border-spacing: 0;
+}
+.openerp .oe-treeview-table th {
+  padding: 10px;
+  color: #4c4c4c;
+  font-weight: bold;
+  background-color: #f0f0f0;
+  border-bottom: 2px solid #cacaca;
+}
+.openerp .oe-treeview-table .treeview-tr, .openerp .oe-treeview-table .treeview-td {
+  cursor: pointer;
+  border-right: 1px dotted #afafb6;
+  vertical-align: top;
+  text-align: left;
+  border-bottom: 1px solid #cfcccc;
+}
+.openerp .oe-treeview-table tr:hover {
+  background-color: #e0e0f8;
+}
+.openerp .oe-treeview-table .oe-number {
+  text-align: right !important;
+}
+.openerp .oe-treeview-table span {
+  font-size: 90%;
+  font-weight: normal;
+  white-space: nowrap;
+  display: block;
+}
+.openerp .oe-treeview-table .treeview-tr.oe-treeview-first {
+  background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat;
+}
+.openerp .oe-treeview-table .oe_open .treeview-tr.oe-treeview-first {
+  background-image: url(/web/static/src/img/collapse.gif);
+}
+.openerp .oe-treeview-table .treeview-tr.oe-treeview-first span, .openerp .oe-treeview-table .treeview-td.oe-treeview-first span {
+  margin-left: 16px;
+}
+
 .kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
   background-size: cover;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2846ce7235d..9dbe2f71ffe 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1747,6 +1747,46 @@ $colour4: #8a89ba
         float: right
         color: #333
     // }}}
+//Tree view
+.openerp
+    .tree_header
+        background-color: #f0f0f0
+        border-bottom: 1px solid #cacaca
+        color: #4c4c4c
+        padding: 5px
+        button
+            float: right
+    .oe-treeview-table
+        width: 100%
+        background-color: white
+        border-spacing: 0
+        th
+            padding: 10px
+            color: #4c4c4c
+            font-weight: bold
+            background-color: #f0f0f0
+            border-bottom: 2px solid #cacaca
+        .treeview-tr, .treeview-td
+            cursor: pointer
+            border-right: 1px dotted #afafb6
+            vertical-align: top
+            text-align: left
+            border-bottom: 1px solid #cfcccc
+        tr:hover
+            background-color: #e0e0f8
+        .oe-number
+            text-align: right !important
+        span
+            font-size: 90%
+            font-weight: normal
+            white-space: nowrap
+            display: block
+        .treeview-tr.oe-treeview-first
+            background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat
+        .oe_open .treeview-tr.oe-treeview-first
+            background-image: url(/web/static/src/img/collapse.gif)
+        .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span
+            margin-left: 16px
 // Kitten Mode {{{
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index e8bd7351f1f..363bf6258f1 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -112,7 +112,12 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
                 $select.change();
             }
         });
-
+        this.$element.find("#tree_view_expand").click(function(){
+                self.expand_all();
+        });
+        this.$element.find("#tree_view_collapse").click(function(){
+            self.collpase_all();
+        });
         // TODO store open nodes in url ?...
         this.do_push_state({});
 
@@ -128,6 +133,17 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
                 return [color, py.parse(py.tokenize(expr)), expr];
             }).value();
     },
+    expand_all: function(){
+    },
+    collpase_all: function(){
+        var self = this;
+        var root_tr = this.$element.find(".oe-treeview-table tbody tr[data-level='"+1+"']");
+        _.each(root_tr,function(rec){
+            if($(rec).hasClass('oe_open')){
+                self.showcontent($(rec).attr('data-id'),false);
+            }
+        });
+    },
     /**
      * Returns the color for the provided record in the current view (from the
      * ``@colors`` attribute)
@@ -259,13 +275,5 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         }, this);
     },
 
-    do_show: function () {
-        this.$element.show();
-    },
-
-    do_hide: function () {
-        this.$element.hide();
-        this.hidden = true;
-    }
 });
 };
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 46fab28d791..5b21802f91a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -535,14 +535,16 @@
 </t>
 
 <t t-name="TreeView">
-    <select t-if="toolbar" style="width: 30%">
-    </select>
-    <table class="oe_tree_table">
+    <div class = "tree_header">
+         <select t-if="toolbar" ></select>
+         <button id = "tree_view_collapse">Collapse All</button>
+         <button id = "tree_view_expand">Expand All</button>
+     </div>
+    <table class="oe-treeview-table">
         <thead>
             <tr>
                 <th t-foreach="fields_view" t-as="field"
-                    t-if="!field.attrs.modifiers.tree_invisible"
-                    class="treeview-header">
+                    t-if="!field.attrs.modifiers.tree_invisible">
                     <t t-esc="fields[field.attrs.name].string" />
                 </th>
             </tr>
@@ -557,7 +559,7 @@
         t-att-data-id="record.id" t-att-data-level="level + 1">
     <t t-set="children" t-value="record[children_field]"/>
     <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
-    <t t-set="rank" t-value="'oe_tree_first'"/>
+    <t t-set="rank" t-value="'oe-treeview-first'"/>
     <t t-set="style" t-value="'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;'"/>
 
     <td t-foreach="fields_view" t-as="field"

From f37d079da6aef3e2e1e100c09334292ed3bee26b Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 3 Jul 2012 17:49:14 +0530
Subject: [PATCH 13/42] [IMP]expand all and render all records with at one
 time.

bzr revid: vme@tinyerp.com-20120703121914-yf9hbri57grukuff
---
 addons/web/static/src/js/view_tree.js | 81 +++++++++++++++------------
 addons/web/static/src/xml/base.xml    |  4 +-
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 363bf6258f1..2e1300ce267 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -63,6 +63,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         }
         return fields;
     },
+    store_record:function(records){
+        var self = this;
+        _(records).each(function (record) {
+            console.log(record.id);
+            self.records[record.id] = record;
+        });
+    },
     on_loaded: function (fields_view) {
         var self = this;
         var has_toolbar = !!fields_view.arch.attrs.toolbar;
@@ -87,17 +94,19 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         this.$element.addClass(this.fields_view.arch.attrs['class']);
 
         this.dataset.read_slice(this.fields_list()).then(function(records) {
+            self.store_record(records);
             if (!has_toolbar) {
                 // WARNING: will do a second read on the same ids, but only on
                 //          first load so not very important
-                self.getdata(null, _(records).pluck('id'));
+                self.render_data({'null':records})
+                self.getdata(_.pluck(records,"id"));
                 return;
             }
 
             var $select = self.$element.find('select')
                 .change(function () {
                     var $option = $(this).find(':selected');
-                    self.getdata($option.val(), $option.data('children'));
+                    self.getdata($option.val());
                 });
             _(records).each(function (record) {
                 self.records[record.id] = record;
@@ -134,6 +143,11 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             }).value();
     },
     expand_all: function(){
+        var self = this;
+        var tr = this.$element.find(".oe-treeview-table tbody tr[id^='treerow_']");
+        _.each(tr,function(rec){
+            self.showcontent($(rec).attr('data-id'),true);
+        });
     },
     collpase_all: function(){
         var self = this;
@@ -180,50 +194,45 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         });
 
         this.$element.delegate('.treeview-tr', 'click', function () {
-            var is_loaded = 0,
-                $this = $(this),
+            var $this = $(this),
                 record_id = $this.data('id'),
-                record = self.records[record_id],
-                children_ids = record[self.children_field];
-
-            _(children_ids).each(function(childid) {
-                if (self.$element.find('#treerow_' + childid).length) {
-                    if (self.$element.find('#treerow_' + childid).is(':hidden')) {
-                        is_loaded = -1;
-                    } else {
-                        is_loaded++;
-                    }
-                }
-            });
-            if (is_loaded === 0) {
-                if (!$this.parent().hasClass('oe_open')) {
-                    self.getdata(record_id, children_ids);
-                }
-            } else {
-                self.showcontent(record_id, is_loaded < 0);
-            }
+                bool = $this.parent().hasClass('oe_open');
+                self.showcontent(record_id, !bool);
         });
     },
     // get child data of selected value
-    getdata: function (id, children_ids) {
+    getdata: function (id) {
         var self = this;
-
-        self.dataset.read_ids(children_ids, this.fields_list()).then(function(records) {
-            _(records).each(function (record) {
-                self.records[record.id] = record;
-            });
-
-            var $curr_node = self.$element.find('#treerow_' + id);
+        var parent_child ={};
+        id = _.isArray(id)?id:parseInt(id); 
+        var ir_model_data = new instance.web.Model(this.model,{},[['id','child_of',id]]).query();
+        ir_model_data._execute().then(function(records){
+              self.store_record(records);
+             _.each(records,function(rec){
+                 if(rec[self.children_field].length === 0)return;
+                 parent_child[rec.id] = [];
+                 _.each(rec[self.children_field],function(key){
+                     parent_child[rec.id].push(self.records[key]);
+                 });
+             })
+             self.render_data(parent_child);
+        });
+    },
+    render_data: function(groupby){
+        var self = this;
+        console.log(groupby);
+        _.each(_.keys(groupby),function(key){
+            var $curr_node = self.$element.find('#treerow_' + key);
+            var record = groupby[key];
             var children_rows = QWeb.render('TreeView.rows', {
-                'records': records,
+                'records': record,
                 'children_field': self.children_field,
                 'fields_view': self.fields_view.arch.children,
                 'fields': self.fields,
-                'level': $curr_node.data('level') || 0,
+                'level': ($curr_node.data('level') || 0) + 1,
                 'render': instance.web.format_value,
                 'color_for': self.color_for
             });
-
             if ($curr_node.length) {
                 $curr_node.addClass('oe_open');
                 $curr_node.after(children_rows);
@@ -231,8 +240,10 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
                 self.$element.find('tbody').html(children_rows);
             }
         });
+        self.collpase_all();
     },
 
+
     // Get details in listview
     activate: function(id) {
         var self = this;
@@ -254,7 +265,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             }
             return self.rpc('/web/session/eval_domain_and_context', {
                 contexts: [c], domains: []
-            }).pipe(function (res) {
+            }).pipe(function (res) {records
                 action.context = res.context;
                 return self.do_action(action);
             }, null);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5b21802f91a..6e0bd2417f1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -556,11 +556,11 @@
 <tr t-name="TreeView.rows"
         t-foreach="records" t-as="record"
         t-att-id="'treerow_' + record.id"
-        t-att-data-id="record.id" t-att-data-level="level + 1">
+        t-att-data-id="record.id" t-att-data-level="level">
     <t t-set="children" t-value="record[children_field]"/>
     <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
     <t t-set="rank" t-value="'oe-treeview-first'"/>
-    <t t-set="style" t-value="'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;'"/>
+    <t t-set="style" t-value="'background-position: ' + 19*(level-1) + 'px; padding-left: ' + 19*(level-1) + 'px;'"/>
 
     <td t-foreach="fields_view" t-as="field"
         t-if="!field.attrs.modifiers.tree_invisible"

From c6ffd20a31c1413adb71716c952f36d74e15533c Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 3 Jul 2012 19:05:08 +0530
Subject: [PATCH 14/42] [IMP]minor changes.

bzr revid: vme@tinyerp.com-20120703133508-33lfisga2u4tlepe
---
 addons/web/static/src/css/base.css    | 3 +++
 addons/web/static/src/css/base.sass   | 3 +++
 addons/web/static/src/js/view_tree.js | 6 ++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 54284aa6be8..e338cc309d9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2220,9 +2220,12 @@
   border-bottom: 1px solid #cacaca;
   color: #4c4c4c;
   padding: 5px;
+  height: 25px;
 }
 .openerp .tree_header button {
   float: right;
+  height: 27px;
+  margin-right: 5px;
 }
 .openerp .oe-treeview-table {
   width: 100%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9dbe2f71ffe..6514ea8d70b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1754,8 +1754,11 @@ $colour4: #8a89ba
         border-bottom: 1px solid #cacaca
         color: #4c4c4c
         padding: 5px
+        height: 25px
         button
             float: right
+            height: 27px
+            margin-right: 5px
     .oe-treeview-table
         width: 100%
         background-color: white
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 2e1300ce267..2181b2aa157 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -66,7 +66,6 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
     store_record:function(records){
         var self = this;
         _(records).each(function (record) {
-            console.log(record.id);
             self.records[record.id] = record;
         });
     },
@@ -205,7 +204,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         var self = this;
         var parent_child ={};
         id = _.isArray(id)?id:parseInt(id); 
-        var ir_model_data = new instance.web.Model(this.model,{},[['id','child_of',id]]).query();
+        var ir_model_data = new instance.web.Model(this.model,self.dataset.get_context() || {},[['id','child_of',id]]).query();
         ir_model_data._execute().then(function(records){
               self.store_record(records);
              _.each(records,function(rec){
@@ -220,7 +219,6 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
     },
     render_data: function(groupby){
         var self = this;
-        console.log(groupby);
         _.each(_.keys(groupby),function(key){
             var $curr_node = self.$element.find('#treerow_' + key);
             var record = groupby[key];
@@ -265,7 +263,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             }
             return self.rpc('/web/session/eval_domain_and_context', {
                 contexts: [c], domains: []
-            }).pipe(function (res) {records
+            }).pipe(function (res) {
                 action.context = res.context;
                 return self.do_action(action);
             }, null);

From fd72bd3cd99502a513d425dbe80efe0954768a37 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 4 Jul 2012 13:12:47 +0530
Subject: [PATCH 15/42] [IMP]:Improve project view. put timesheet and all in
 one group

bzr revid: atp@tinyerp.com-20120704074247-c78ph5cpky9lfyr5
---
 .../analytic_contract_project_view.xml        | 11 +++++-----
 addons/project/project_view.xml               | 20 +++++++++----------
 addons/project_issue/project_issue_view.xml   | 11 +++++-----
 .../project_long_term_view.xml                | 11 +++++-----
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 0e61fe08d01..545c8ac8691 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -103,11 +103,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_timesheets"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                   <label for="use_timesheets"/>
+                    <div>
+                        <field name="use_timesheets"/>
+                        <button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0e19667a7f5..eac9d37d967 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -94,19 +94,17 @@
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
                         </group>
-                        <group>
-                            <table>
-                                <tr name="use_tasks_row">
-                                    <td><group><field name="use_tasks"/></group></td>
-                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <td/>
-                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
-                                </tr>
-                            </table>
+                        <group name="use_tasks_row">
+                            <label for="use_tasks"/>
+                            <div>
+                                <field name="use_tasks"/>
+                                <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                            </div>
                         </group>
                     </group>
+                    <group>
+                        <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
+                    </group>
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0e2c085921b..9dbef53ddd6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -387,11 +387,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_issues"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                    <label for="use_issues"/>
+                    <div>
+                        <field name="use_issues"/>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
+                    </div>
                 </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 03946b20a2d..53b5a14cb71 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,11 +111,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                    <label for="use_phases"/>
+                    <div>
+                        <field name="use_phases"/>
+                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/>
+                    </div>
                 </xpath>
             </field>
         </record>

From 793f31c2a7c66872ab368a0935f62510ee4a9e65 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 4 Jul 2012 15:40:58 +0530
Subject: [PATCH 16/42] [IMP]: Improve analytic_contract_project view

bzr revid: atp@tinyerp.com-20120704101058-q31s9l6gaorwar8v
---
 .../analytic_contract_project_view.xml                        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 545c8ac8691..2b7d965cd94 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -15,7 +15,9 @@
                             <group string="Validity">
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
+                                    <field name="date_start" class="oe_inline"/> 
+                                     <span  attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span>
+                                     <field name="date" class="oe_inline"/>
                                 </div>
                                 <label for="quantity_max"/>
                                 <div>

From f461d0373480ee5e0e905c76afa3776cb204540e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 09:24:23 +0530
Subject: [PATCH 17/42] [IMP]: Put document button after Tasks button in
 project view.

bzr revid: atp@tinyerp.com-20120706035423-1bysvapisarm3c69
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3889d8d03ae..14ab283ddbb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -99,12 +99,12 @@
                             <div>
                                 <field name="use_tasks"/>
                                 <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                                <group>
+                                    <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
+                                </group>
                             </div>
                         </group>
                     </group>
-                    <group>
-                        <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
-                    </group>
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">

From 5e7f7bef7bed54bc8f4f889720b3cde11915cf25 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 11:26:53 +0530
Subject: [PATCH 18/42] [FIX]: Set document button for project view.

bzr revid: atp@tinyerp.com-20120706055653-h546ptvo3b95yq6f
---
 .../analytic_contract_project_view.xml                |  2 +-
 addons/project/project_view.xml                       | 11 ++++++-----
 addons/project_issue/project_issue_view.xml           |  2 +-
 addons/project_long_term/project_long_term_view.xml   |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 2b7d965cd94..78497a314a0 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -105,7 +105,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                <xpath expr='//div[@name="Tasks"]' position='after'>
                    <label for="use_timesheets"/>
                     <div>
                         <field name="use_timesheets"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 14ab283ddbb..ebef8f6e6fe 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -94,14 +94,15 @@
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
                         </group>
-                        <group name="use_tasks_row">
+                        <group>
                             <label for="use_tasks"/>
-                            <div>
+                            <div name="Tasks">
                                 <field name="use_tasks"/>
                                 <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
-                                <group>
-                                    <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
-                                </group>
+                            </div>
+                            <label string=""/>
+                            <div style="margin-left: 15px;">
+                              <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
                             </div>
                         </group>
                     </group>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9dbef53ddd6..5f4a1f95228 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -387,7 +387,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                <xpath expr='//div[@name="Tasks"]' position='after'>
                     <label for="use_issues"/>
                     <div>
                         <field name="use_issues"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53b5a14cb71..7035c559a14 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,7 +111,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="use_tasks_row"]' position='inside'>
+                <xpath expr='//div[@name="Tasks"]' position='after'>
                     <label for="use_phases"/>
                     <div>
                         <field name="use_phases"/>

From 64bd1cdd8786a6aaf89275d426298760c2ddf7bd Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 13:12:15 +0530
Subject: [PATCH 19/42] [FIX]: Add currency_id field

bzr revid: atp@tinyerp.com-20120706074215-4225u3zkx00gtfw5
---
 addons/account/account_analytic_line.py                  | 2 +-
 addons/account/project/project_view.xml                  | 9 +++------
 .../hr_timesheet_invoice/hr_timesheet_invoice_view.xml   | 2 +-
 addons/project_timesheet/project_timesheet_view.xml      | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index d610e3813b9..06de5a3e43e 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -34,7 +34,7 @@ class account_analytic_line(osv.osv):
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
-        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
         'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount Currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
     }
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index a721f543c36..f132e6f50d0 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -253,12 +253,9 @@
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                                <field invisible="1" name="general_account_id"/>
-                            </div>
+                            <field name="amount_currency"/>
+                            <field name="currency_id"/>
+                            <field invisible="1" name="general_account_id"/>
                         </group>
                         <group string="Product Information">
                             <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 3ec14a81213..9888972105e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -123,7 +123,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 1a15af1df3e..4d3d288b981 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -88,7 +88,7 @@
 
         <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Works</field>
+            <field name="name">Invoice Tasks Work</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From 8244a2e1afd8898ed03c0a510d2053b3277bf5bf Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 6 Jul 2012 14:00:09 +0530
Subject: [PATCH 20/42] [FIX]: account_currency problem.

bzr revid: atp@tinyerp.com-20120706083009-i1ygni2byaht51pt
---
 addons/account/project/project_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index f132e6f50d0..ca4d6f2214f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -253,8 +253,11 @@
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
-                            <field name="amount_currency"/>
-                            <field name="currency_id"/>
+                            <label for="amount_currency"/>
+                            <div>
+                                <field name="amount_currency" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
                             <field invisible="1" name="general_account_id"/>
                         </group>
                         <group string="Product Information">

From 0dfc3249ecae54f0c7da48879ba2c0df70672803 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Sat, 7 Jul 2012 16:52:17 +0200
Subject: [PATCH 21/42] Remove account types definied in l10n_fr Now uses
 account types of the 'account' module Some small fixes in the chart of
 account

bzr revid: alexis@via.ecp.fr-20120707145217-a2oax2spqhl2cm7r
---
 addons/l10n_fr/plan_comptable_general.xml | 3023 +++++++--------------
 1 file changed, 978 insertions(+), 2045 deletions(-)

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>
 

From e9e069a2164bfe8eec0afe4e1aaa47d69b06bb1f Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Sat, 7 Jul 2012 18:36:05 +0200
Subject: [PATCH 22/42] Add an option "Tax calculation rounding method" that
 can be set to "Round per line" (it's the default value and the behavior of
 the previous versions of OpenERP) or to "Round globally".

bzr revid: alexis@via.ecp.fr-20120707163605-byo0o11f2q9dsczl
---
 addons/account/account.py          | 36 +++++++++++++++++++++---------
 addons/account/company.py          |  6 +++++
 addons/account/company_view.xml    |  1 +
 addons/account/res_config.py       |  7 ++++++
 addons/account/res_config_view.xml |  1 +
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index caf1d68c45d..29acca9fc07 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2066,7 +2066,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 +2088,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 +2096,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 +2109,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 +2118,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
 
@@ -2188,7 +2202,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 +2212,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/company.py b/addons/account/company.py
index 932f7750faa..433c03c8912 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..6fb763f686f 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/res_config.py b/addons/account/res_config.py
index 8ca35426427..7a1540e6e6b 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..b19c81e9637 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>

From bc3a9c4f434b11caa985d1ce122b1949cad7eeb7 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Mon, 9 Jul 2012 15:40:24 +0200
Subject: [PATCH 23/42] [FIX] Replace browse on products by read in order to
 increase performances.

bzr revid: benoit.guillot@akretion.com.br-20120709134024-kh03pbdc1vugca73
---
 addons/product/product.py |  4 ++--
 addons/stock/product.py   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

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/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 = []

From 36cb6f479a6483d20cc894ca91f40159d53b6ec9 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Mon, 9 Jul 2012 18:21:24 +0200
Subject: [PATCH 24/42] Use product.product instead of product.template when we
 go through the ORM. In this process, I re-wrote the fonction
 change_product_qty_send_note in stock/wizard/stock_change_product_qty.py :
 the code is now much better !

bzr revid: alexis@via.ecp.fr-20120709162124-jmqv7hrl94fbzk1j
---
 addons/product/pricelist.py                        |  3 +--
 .../product_visible_discount.py                    | 10 ++--------
 addons/stock/wizard/stock_change_product_qty.py    | 14 ++++----------
 .../wizard/stock_planning_createlines.py           |  4 +---
 .../wizard/stock_planning_forecast.py              |  4 +---
 5 files changed, 9 insertions(+), 26 deletions(-)

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_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 5d833ea6b53..d477d2bd8c3 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)
 
             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)
 
             factor = 1.0
             if uom and uom != product.uom_id.id:
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_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_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

From fe4151971b5abebe8266d61ad1a5e90a99defb6c Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 10 Jul 2012 15:32:55 +0200
Subject: [PATCH 25/42] Add 'employee_ids' one2many field on res.users ; it is
 the reverse of the 'user_id' many2one field on hr.employee. Add the field to
 the form view of res.users.

bzr revid: alexis@via.ecp.fr-20120710133255-j78hqsqkfjegui2y
---
 addons/hr/hr.py                  |  4 ++++
 addons/hr/hr_department_view.xml | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

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/hr_department_view.xml b/addons/hr/hr_department_view.xml
index bbf66f0d4c3..6780feca71a 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -60,5 +60,19 @@
 
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
-        </data>
+       <record id="res_users_form_add_employees" model="ir.ui.view">
+            <field name="name">res.users.form.add.employees</field>
+            <field name="type">form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <page string="Access Rights" position="after">
+                    <page string="Employees">
+                        <field name="employee_ids" nolabel="1" colspan="4" />
+                    </page>
+                </page>
+            </field>
+        </record>
+
+    </data>
 </openerp>

From fb7120d7b60aa04d5eb6580fb7dc769f8a46720c Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 10 Jul 2012 23:21:15 +0200
Subject: [PATCH 26/42] Add analytic account on taxes and invoice tax lines.

bzr revid: alexis@via.ecp.fr-20120710212115-r56jev507ka9eca5
---
 addons/account/account.py               | 10 ++++++++--
 addons/account/account_invoice.py       | 12 ++++++++----
 addons/account/account_invoice_view.xml |  2 ++
 addons/account/account_view.xml         |  4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index caf1d68c45d..36e540359f5 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,
@@ -2160,6 +2164,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,
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..d852c95449d 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..10a523dbf6b 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"/>

From c62b820d51254f11c50b855daea0139cc22e32e2 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 11 Jul 2012 01:35:03 +0200
Subject: [PATCH 27/42] Add ability to have %(currency_name)s in the
 format_layout of res.partner.bank.type

bzr revid: alexis@via.ecp.fr-20120710233503-i2b9g62syvz02gra
---
 addons/account/account_bank.py | 6 ++++++
 1 file changed, 6 insertions(+)

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]

From 800ed238d535c9f062e42e82aa9ba769744becbd Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 11 Jul 2012 01:50:09 +0200
Subject: [PATCH 28/42] Allows inheritance of the name_get function of
 res.partner.bank

bzr revid: alexis@via.ecp.fr-20120710235009-msv7aiaa3gfhznmq
---
 openerp/addons/base/res/res_bank.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index c9010b64319..c5c05c1807c 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -172,6 +172,17 @@ class res_partner_bank(osv.osv):
                             ('required', field.required)]
         return res
 
+    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
+        """
+        Format the name of a res.partner.bank.
+        This function is designed to be inherited to add replacement fields.
+        :param browse_record bank_type_obj: res.partner.bank.type object
+        :param browse_record bank_obj: res.partner.bank object
+        :rtype: str
+        :return: formatted name of a res.partner.bank record
+        """
+        return bank_type_obj.format_layout % bank_obj._data[bank_obj.id]
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -187,7 +198,7 @@ class res_partner_bank(osv.osv):
                         # avoid the default format_layout to result in "False: ..."
                         if not val._data[val.id]['bank_name']:
                             val._data[val.id]['bank_name'] = _('BANK')
-                        result = t.format_layout % val._data[val.id]
+                        result = self._prepare_name_get(cr, uid, t, val, context=context)
                     except:
                         result += ' [Formatting Error]'
                         raise

From 90aaa0384f39a265a7e9b3f3af19fef1ad1babbf Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 11 Jul 2012 12:42:40 +0530
Subject: [PATCH 29/42] [IMP] : improve title & description for modules

bzr revid: cha@tinyerp.com-20120711071240-qa3l60wcisjmu4w3
---
 addons/web/__openerp__.py           | 4 ++--
 addons/web_calendar/__openerp__.py  | 4 ++--
 addons/web_dashboard/__openerp__.py | 4 ++--
 addons/web_diagram/__openerp__.py   | 2 +-
 addons/web_gantt/__openerp__.py     | 4 ++--
 addons/web_graph/__openerp__.py     | 2 +-
 addons/web_mobile/__openerp__.py    | 4 ++--
 addons/web_rpc/__openerp__.py       | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 6863779e41f..d54c643808b 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,10 +1,10 @@
 {
-    "name" : "web",
+    "name" : "Web",
     "category": "Hidden",
     "description":
         """
         OpenERP Web core module.
-        This module provides the core of the OpenERP web client.
+        This module provides the core of the OpenERP Web Client.
         """,
     "depends" : [],
     'auto_install': True,
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index e181fb837bf..755d6fdb1f7 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -1,9 +1,9 @@
 {
-    "name": "web calendar",
+    "name": "Web Calendar",
     "category": "Hidden",
     "description":
         """
-        OpenERP Web calendar view.
+        OpenERP Web Calendar view.
         """,
     "version": "2.0",
     "depends": ['web'],
diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py
index b739326e140..a48b3f9c0f5 100644
--- a/addons/web_dashboard/__openerp__.py
+++ b/addons/web_dashboard/__openerp__.py
@@ -1,9 +1,9 @@
 {
-    "name": "web Dashboard",
+    "name": "Web Dashboard",
     "category": "Hidden",
     "description":
         """
-        OpenERP Web dashboard view.
+        OpenERP Web Dashboard view.
         """,
     "version": "2.0",
     "depends": ['web'],
diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
index 512c36d60e3..247506cf581 100644
--- a/addons/web_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -1,7 +1,7 @@
 {
     "name" : "OpenERP Web Diagram",
     "category" : "Hidden",
-    "description":'Openerp web Diagram view',
+    "description":'Openerp Web Diagram view',
     "version" : "2.0",
     "depends" : ["web"],
     "js": [
diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
index ee6b2d71d18..3357dbae53f 100644
--- a/addons/web_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -1,9 +1,9 @@
 {
-    "name": "web Gantt",
+    "name": "Web Gantt",
     "category": "Hidden",
     "description":
         """
-        OpenERP Web gantt chart view.
+        OpenERP Web Gantt chart view.
         """,
     "version": "2.0",
     "depends": ['web'],
diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 19f46dbb504..84412a9c240 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -5,7 +5,7 @@
 
 * Parse a <graph> view but allows changing dynamically the presentation
 * Graph Types: pie, lines, areas, bars, radar
-* Stacked / Not Stacked for areas and bars
+* Stacked/Not Stacked for areas and bars
 * Legends: top, inside (top/left), hidden
 * Features: download as PNG or CSV, browse data grid, switch orientation
 * Unlimited "Group By" levels (not stacked), two cross level analysis (stacked)
diff --git a/addons/web_mobile/__openerp__.py b/addons/web_mobile/__openerp__.py
index ce76361f619..cd5a4836a5a 100644
--- a/addons/web_mobile/__openerp__.py
+++ b/addons/web_mobile/__openerp__.py
@@ -1,9 +1,9 @@
 {
-    "name" : "OpenERP Web mobile",
+    "name" : "OpenERP Web Mobile",
     "category": "Hidden",
     "description":
         """
-        OpenERP Web mobile.
+        OpenERP Web Mobile.
         """,
     "version" : "2.0",
     "depends" : [],
diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py
index f35f92c153e..27ec39f5748 100644
--- a/addons/web_rpc/__openerp__.py
+++ b/addons/web_rpc/__openerp__.py
@@ -1,7 +1,7 @@
 {
-    "name" : "OpenERP Web web",
+    "name" : "OpenERP Web Web",
     "category" : "Hidden",
-    "description":'Openerp web web',
+    "description":'Openerp Web Web',
     "version" : "2.0",
     "depends" : [],
     "installable" : False,

From f419cb8e024ea6a8713091714f940f2ffddf150e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 11 Jul 2012 12:27:13 +0200
Subject: [PATCH 30/42] [IMP] customized werkzeug cache handling for static
 files

bzr revid: nicolas.vanhoren@openerp.com-20120711102713-ka8b1hcf46mdg2wh
---
 addons/web/common/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 487800da1b9..cc76a554693 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -453,7 +453,7 @@ class Root(object):
         static_dirs = self._load_addons(openerp_addons_namespace)
         if options.serve_static:
             self.dispatch = werkzeug.wsgi.SharedDataMiddleware(
-                self.dispatch, static_dirs)
+                self.dispatch, static_dirs, cache=False)
 
         if options.session_storage:
             if not os.path.exists(options.session_storage):

From fad2a1345b00856603493226f787e2ba1dad7e79 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 11 Jul 2012 14:47:31 +0200
Subject: [PATCH 31/42] [FIX] problem with previous improvement, make some
 views crash

bzr revid: nicolas.vanhoren@openerp.com-20120711124731-mgn9028814kj9esn
---
 addons/web_kanban/static/src/js/kanban.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 7c9b99abc12..3480418c755 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -750,7 +750,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
             // Set the cache duration in seconds.
             url += '&cache=' + parseInt(cache, 10);
         }
-        if (this.record[field].value && ! /^\d+(\.\d*)? \w+$/.test(this.record[field].value)) {
+        if (this.record[field] && this.record[field].value && ! /^\d+(\.\d*)? \w+$/.test(this.record[field].value)) {
             url = 'data:image/png;base64,' + this.record[field].value;
         }
         return url;

From 55f66ab125954e86ba774ed95c89d07bff0f5962 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 11 Jul 2012 15:08:45 +0200
Subject: [PATCH 32/42] [FIX] corrected problem with quick create in m2m kanban

bzr revid: nicolas.vanhoren@openerp.com-20120711130845-w7w7yibjh1smymbg
---
 addons/web/static/lib/jquery.textext/jquery.textext.css | 4 ----
 addons/web_kanban/static/src/css/kanban.css             | 1 -
 addons/web_kanban/static/src/css/kanban.sass            | 1 -
 3 files changed, 6 deletions(-)

diff --git a/addons/web/static/lib/jquery.textext/jquery.textext.css b/addons/web/static/lib/jquery.textext/jquery.textext.css
index fe144e48af6..f180ee66184 100644
--- a/addons/web/static/lib/jquery.textext/jquery.textext.css
+++ b/addons/web/static/lib/jquery.textext/jquery.textext.css
@@ -65,10 +65,6 @@
   padding: 3px 5px;
   cursor: pointer;
 }
-.text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
-  font-style: normal;
-  text-decoration: underline;
-}
 .text-core .text-wrap .text-dropdown .text-list .text-suggestion.text-selected {
   color: #fff;
   background: #6d84b4;
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 60967f50afd..a48163f3016 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -124,7 +124,6 @@
   float: right;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create {
-  overflow: hidden;
   margin-bottom: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_quick_create_buttons {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 94daf4bd3cd..88c38124997 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -132,7 +132,6 @@
         float: right
 
     .oe_kanban_quick_create
-        overflow: hidden
         margin-bottom: 4px
     .oe_kanban_quick_create_buttons
         margin: 4px 0

From 08d35f3eaabcd7c48d3e898ce50d23e9abca5fbb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Jul 2012 16:23:06 +0200
Subject: [PATCH 33/42] [REM] Remove unused selector in kanban sass

Properties removed in rev: 2460.2.32 revid:mit@openerp.com-20120629160606-8dyxa381pm3xcde6 but selector leftover

bzr revid: fme@openerp.com-20120711142306-a0lmk21v9yc3iu4p
---
 addons/web_kanban/static/src/css/kanban.sass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 88c38124997..dc6bc31344d 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -120,7 +120,6 @@
         width: 16px
         height: 16px
         background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat
-    .oe_kanban_group_folded .oe_kanban_fold_icon
     // }}}
     // KanbanQuickCreate {{{
     .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle

From 8c4af1a1d4845d94af00bb35a0320971762a271a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Jul 2012 16:44:40 +0200
Subject: [PATCH 34/42] [IMP] Improved kanban dropdown

bzr revid: fme@openerp.com-20120711144440-oksivy1kmcmjm2zw
---
 addons/web/static/src/js/chrome.js           |  5 +++--
 addons/web_kanban/static/src/css/kanban.css  | 11 ++++++++---
 addons/web_kanban/static/src/css/kanban.sass |  9 ++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b87ebe56856..970d509d481 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -894,11 +894,12 @@ instance.web.WebClient = instance.web.Widget.extend({
         });
         this.$element.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
-            var $menu = $(this).find('.oe_dropdown_menu');
+            var $toggle = $(this);
+            var $menu = $toggle.find('.oe_dropdown_menu');
             var state = $menu.is('.oe_opened');
             setTimeout(function() {
                 // Do not alter propagation
-                $menu.toggleClass('oe_opened', !state);
+                $toggle.add($menu).toggleClass('oe_opened', !state);
                 if (!state) {
                     // Move $menu if outside window's edge
                     var doc_width = $(document).width();
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index a48163f3016..4f3204e15f7 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -345,8 +345,8 @@
   -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
   -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
 }
-.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban {
-  display: block;
+.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span {
+  visibility: visible;
 }
 .openerp .oe_kanban_view .oe_kanban_card h3 {
   margin: 0 16px 0 0;
@@ -445,9 +445,11 @@
   position: absolute;
   top: -8px;
   right: 3px;
-  display: none;
   cursor: pointer;
 }
+.openerp .oe_kanban_view .oe_dropdown_kanban > span {
+  visibility: hidden;
+}
 .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
   text-decoration: none;
 }
@@ -456,6 +458,9 @@
   top: 28px;
   min-width: 160px;
 }
+.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
+  visibility: visible;
+}
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
   padding: 3px 6px;
   white-space: nowrap;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index dc6bc31344d..39898f19094 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -296,8 +296,8 @@
             margin-bottom: 0
         &:hover
             @include box-shadow(0 0 3px rgba(0,0,0,0.6))
-            .oe_dropdown_kanban
-                display: block
+            .oe_dropdown_kanban > span
+                visibility: visible
         h3
             margin: 0 16px 0 0
             color: #4c4c4c
@@ -363,14 +363,17 @@
         position: absolute
         top: -8px
         right: 3px
-        display: none
         cursor: pointer
+        > span
+            visibility: hidden
         &:hover
             text-decoration: none
         .oe_dropdown_menu
             left: 0
             top: 28px
             min-width: 160px
+    .oe_dropdown_kanban.oe_opened > span
+        visibility: visible
     // }}}
     // KanbanColorPicker {{{
     .oe_kanban_colorpicker

From 972ebae7cc5e5364329e2d94faee4772d69305d7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 11 Jul 2012 16:44:59 +0200
Subject: [PATCH 35/42] [IMP] module form view

bzr revid: fp@tinyerp.com-20120711144459-hdfmuhdauhek1qpc
---
 openerp/addons/base/module/module_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 97df3bd26d2..a9f3620fb57 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -128,9 +128,7 @@
                         <field name="icon_image" widget="image"/>
                     </div>
                     <div class="oe_title">
-                        <label for="shortdesc" class="oe_edit_only"/>
                         <h1><field name="shortdesc"/></h1>
-                        <label for="category_id" class="oe_edit_only"/>
                         <h2><field name="category_id" class="oe_inline"/></h2>
                     </div>
                     <group>

From 86853063f9aa70cf2f406d0ce7550f4e8a343e1f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Jul 2012 16:55:26 +0200
Subject: [PATCH 36/42] [FIX] Previous kanban dropdown improvement broke kanban
 header dropdown

bzr revid: fme@openerp.com-20120711145526-7sl5fxik34zgesw1
---
 addons/web_kanban/static/src/css/kanban.css  | 11 +++++++----
 addons/web_kanban/static/src/css/kanban.sass | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 4f3204e15f7..cd8a6da1d45 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -447,9 +447,6 @@
   right: 3px;
   cursor: pointer;
 }
-.openerp .oe_kanban_view .oe_dropdown_kanban > span {
-  visibility: hidden;
-}
 .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
   text-decoration: none;
 }
@@ -458,9 +455,15 @@
   top: 28px;
   min-width: 160px;
 }
-.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span {
+.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban {
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban.oe_opened > span {
   visibility: visible;
 }
+.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban > span {
+  visibility: hidden;
+}
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
   padding: 3px 6px;
   white-space: nowrap;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 39898f19094..b3452b9356b 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -364,16 +364,21 @@
         top: -8px
         right: 3px
         cursor: pointer
-        > span
-            visibility: hidden
         &:hover
             text-decoration: none
         .oe_dropdown_menu
             left: 0
             top: 28px
             min-width: 160px
-    .oe_dropdown_kanban.oe_opened > span
-        visibility: visible
+    .oe_kanban_header
+        .oe_dropdown_kanban
+            display: none
+    .oe_kanban_column
+        .oe_dropdown_kanban
+            &.oe_opened > span
+                visibility: visible
+            > span
+                visibility: hidden
     // }}}
     // KanbanColorPicker {{{
     .oe_kanban_colorpicker

From 510fe019ca075e12b9db95d9d71a8c58813337cd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Jul 2012 17:26:51 +0200
Subject: [PATCH 37/42] [CHG] Added dummy cell to kanban view

bzr revid: fme@openerp.com-20120711152651-iaojxuurbxzgjevz
---
 addons/web_kanban/static/src/js/kanban.js       | 5 ++---
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 3480418c755..ce56b7a041f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -219,7 +219,6 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             group.destroy();
         });
         this.groups = [];
-        this.$element.find('.oe_kanban_groups_headers, .oe_kanban_groups_records').empty();
     },
     do_add_groups: function(groups) {
         var self = this;
@@ -227,7 +226,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             self.groups[group.undefined_title ? 'unshift' : 'push'](group);
         });
         var groups_started = _.map(this.groups, function(group) {
-            return group.appendTo(self.$element.find('.oe_kanban_groups_headers'));
+            return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last'));
         });
         return $.when.apply(null, groups_started).then(function () {
             self.on_groups_started();
@@ -394,7 +393,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             self.quick.replace($(".oe_kanban_no_group_qc_placeholder"));
         }
         this.$records = $(QWeb.render('KanbanView.group_records_container', { widget : this}));
-        this.$records.appendTo(this.view.$element.find('.oe_kanban_groups_records'));
+        this.$records.insertBefore(this.view.$element.find('.oe_kanban_groups_records td:last'));
         this.$element.find(".oe_kanban_fold_icon").click(function() {
             self.do_toggle_fold();
             self.view.compute_groups_width();
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 7eb453371b2..0557f71b85b 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -4,8 +4,10 @@
         <div class="oe_kanban_buttons"/>
         <table class="oe_kanban_groups">
         <tr class="oe_kanban_groups_headers">
+            <td class="oe_kanban_dummy_cell"/>
         </tr>
         <tr class="oe_kanban_groups_records">
+            <td class="oe_kanban_dummy_cell"/>
         </tr>
         </table>
     </div>

From 4358a245619d9f10b41f03c99dfd8f69a6e3a964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 11 Jul 2012 18:06:53 +0200
Subject: [PATCH 38/42] [FIX] missing name in a view form broke the point of
 sale

bzr revid: fva@openerp.com-20120711160653-9sadlkxf30u9nwn2
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 1d934b5d390..a429c84ede7 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -209,7 +209,7 @@
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </h2>
                     </div>
-                    <group col="4" string="Preferences">
+                    <group col="4" name="preferences" string="Preferences">
                         <field name="context_lang" readonly="0"/>
                         <field name="context_tz" readonly="0"/>
                     </group>

From d2e77a5de15f2d9195d771e3a39e4b8bc33842c4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 11 Jul 2012 18:32:23 +0200
Subject: [PATCH 39/42] [REV] Revert last commit

bzr revid: fme@openerp.com-20120711163223-zeqr498v3oxvmryd
---
 addons/web_kanban/static/src/js/kanban.js       | 5 +++--
 addons/web_kanban/static/src/xml/web_kanban.xml | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index ce56b7a041f..3480418c755 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -219,6 +219,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             group.destroy();
         });
         this.groups = [];
+        this.$element.find('.oe_kanban_groups_headers, .oe_kanban_groups_records').empty();
     },
     do_add_groups: function(groups) {
         var self = this;
@@ -226,7 +227,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
             self.groups[group.undefined_title ? 'unshift' : 'push'](group);
         });
         var groups_started = _.map(this.groups, function(group) {
-            return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last'));
+            return group.appendTo(self.$element.find('.oe_kanban_groups_headers'));
         });
         return $.when.apply(null, groups_started).then(function () {
             self.on_groups_started();
@@ -393,7 +394,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
             self.quick.replace($(".oe_kanban_no_group_qc_placeholder"));
         }
         this.$records = $(QWeb.render('KanbanView.group_records_container', { widget : this}));
-        this.$records.insertBefore(this.view.$element.find('.oe_kanban_groups_records td:last'));
+        this.$records.appendTo(this.view.$element.find('.oe_kanban_groups_records'));
         this.$element.find(".oe_kanban_fold_icon").click(function() {
             self.do_toggle_fold();
             self.view.compute_groups_width();
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index 0557f71b85b..7eb453371b2 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -4,10 +4,8 @@
         <div class="oe_kanban_buttons"/>
         <table class="oe_kanban_groups">
         <tr class="oe_kanban_groups_headers">
-            <td class="oe_kanban_dummy_cell"/>
         </tr>
         <tr class="oe_kanban_groups_records">
-            <td class="oe_kanban_dummy_cell"/>
         </tr>
         </table>
     </div>

From b0b5a5988f613350d16d50d09adc9c12eb15022a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 12 Jul 2012 04:58:48 +0000
Subject: [PATCH 40/42] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120712044116-gnxo3c234xwbzacm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712045848-qoy4f00epmiytqw2
---
 addons/account/i18n/zh_CN.po        |   2 +-
 addons/base_setup/i18n/ja.po        |  24 +++----
 addons/point_of_sale/i18n/ja.po     |   8 +--
 addons/project_timesheet/i18n/mn.po |   2 +-
 addons/stock/i18n/ja.po             |   6 +-
 addons/web_diagram/i18n/bg.po       |  81 +++++++++++++++++++++
 addons/web_gantt/i18n/bg.po         |  28 ++++++++
 addons/web_kanban/i18n/bg.po        |  69 ++++++++++++++++++
 addons/web_mobile/i18n/bg.po        | 106 ++++++++++++++++++++++++++++
 9 files changed, 305 insertions(+), 21 deletions(-)
 create mode 100644 addons/web_diagram/i18n/bg.po
 create mode 100644 addons/web_gantt/i18n/bg.po
 create mode 100644 addons/web_kanban/i18n/bg.po
 create mode 100644 addons/web_mobile/i18n/bg.po

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 37fe86db46b..96edc80159f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,7 +13,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-11 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
 "X-Generator: Launchpad (build 15593)\n"
 
 #. module: account
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/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/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index 0dbf42990af..47f4d277089 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.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-11 05:15+0000\n"
+"X-Launchpad-Export-Date: 2012-07-12 04:41+0000\n"
 "X-Generator: Launchpad (build 15593)\n"
 
 #. module: project_timesheet
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/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
new file mode 100644
index 00000000000..746c127c8fc
--- /dev/null
+++ b/addons/web_diagram/i18n/bg.po
@@ -0,0 +1,81 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-11 13:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-12 04:58+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr "Диаграма"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:165
+msgid "Are you sure?"
+msgstr "Сигурни ли сте?"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:195
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Изтриването на този възел не може да бъде отменено.\n"
+"То също така ще изтрие и всички свързани преходи.\n"
+"\n"
+"Сигурни ли сте?"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:213
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Изтриването на този възел не може да бъде отменено.\n"
+"\n"
+"Сигурни ли сте?"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr "Дейност"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr "Отвори: "
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr "Създай:"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr "Преход"
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr "Нов възел"
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
new file mode 100644
index 00000000000..5b4bda644db
--- /dev/null
+++ b/addons/web_gantt/i18n/bg.po
@@ -0,0 +1,28 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-11 13:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-12 04:58+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr ""
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Създай"
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
new file mode 100644
index 00000000000..21d063845af
--- /dev/null
+++ b/addons/web_kanban/i18n/bg.po
@@ -0,0 +1,69 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-11 14:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-12 04:58+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Канбан"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:372
+msgid "Undefined"
+msgstr "Неопределен"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:684
+msgid "Are you sure you want to delete this record ?"
+msgstr "Сигурни ли сте, че искате да изтриете този запис?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:839
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+msgid "Show more... ("
+msgstr "Покажи повече... ("
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:53
+msgid "remaining)"
+msgstr "оставащ)"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:72
+msgid "Cancel"
+msgstr ""
+
+#~ msgid "Create"
+#~ msgstr "Създаване"
+
+#~ msgid "</tr><tr>"
+#~ msgstr "</tr><tr>"
diff --git a/addons/web_mobile/i18n/bg.po b/addons/web_mobile/i18n/bg.po
new file mode 100644
index 00000000000..3c80927c542
--- /dev/null
+++ b/addons/web_mobile/i18n/bg.po
@@ -0,0 +1,106 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-11 14:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-12 04:58+0000\n"
+"X-Generator: Launchpad (build 15593)\n"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:17
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:22
+msgid "Database:"
+msgstr "База данни:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:30
+msgid "Login:"
+msgstr "Вход:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:32
+msgid "Password:"
+msgstr "Парола:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:34
+msgid "Login"
+msgstr "Вход"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:36
+msgid "Bad username or password"
+msgstr "Грешно потребителско име или парола"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:42
+msgid "Powered by openerp.com"
+msgstr "Powered by openerp.com"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:49
+msgid "Home"
+msgstr "Начало"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:57
+msgid "Favourite"
+msgstr "Любими"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:58
+msgid "Preference"
+msgstr "Предпочитания"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:123
+msgid "Logout"
+msgstr "Изход"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:132
+msgid "There are no records to show."
+msgstr "Няма записи за показване."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:183
+msgid "Open this resource"
+msgstr "Отвори този ресурс"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:223
+#: addons/web_mobile/static/src/xml/web_mobile.xml:226
+msgid "Percent of tasks closed according to total of tasks to do..."
+msgstr "Процент на приключените задачи съпоставен с общия брой задачи..."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:264
+#: addons/web_mobile/static/src/xml/web_mobile.xml:268
+msgid "On"
+msgstr "Включено"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:265
+#: addons/web_mobile/static/src/xml/web_mobile.xml:269
+msgid "Off"
+msgstr "Изключено"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:294
+msgid "Form View"
+msgstr ""

From 0c4b5b5cf2ec6d94163c5010080bd8841241d6fc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 12 Jul 2012 16:46:00 +0200
Subject: [PATCH 41/42] [IMP] project.*: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120712144600-irb7zscuotkz4jsg
---
 addons/account/project/project_view.xml       |  4 +-
 ...analytic_contract_expense_project_view.xml |  8 +--
 .../analytic_contract_project_view.xml        | 15 +++--
 addons/project/project.py                     |  4 +-
 addons/project/project_view.xml               | 56 ++++++++-----------
 addons/project_issue/project_issue_view.xml   | 43 ++++++++------
 .../project_long_term_view.xml                | 38 ++++++-------
 addons/resource/resource.py                   |  4 +-
 addons/resource/resource_view.xml             | 32 +++++------
 9 files changed, 100 insertions(+), 104 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index ca4d6f2214f..492ab249a39 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -264,8 +264,8 @@
                             <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
                             <label for="unit_amount"/>
                             <div>
-                            <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
-                            <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
                             </div>
                         </group>
                     </group>
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
index d4350c7325f..3e892d5940f 100644
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -15,13 +15,13 @@
                         </td><td>
                             <field name="charge_expenses"/>
                         </td><td>
-                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
-                            <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <field class="oe_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                             <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 78497a314a0..9914ed455af 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -16,8 +16,8 @@
                                 <label for="date_start" string="Duration"/>
                                 <div name="duration">
                                     <field name="date_start" class="oe_inline"/> 
-                                     <span  attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span>
-                                     <field name="date" class="oe_inline"/>
+                                    <label attrs="{'invisible':[('date','=',False)]}" class="oe_inline" string=" - "/>
+                                    <field name="date" class="oe_inline"/>
                                 </div>
                                 <label for="quantity_max"/>
                                 <div>
@@ -105,12 +105,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="Tasks"]' position='after'>
-                   <label for="use_timesheets"/>
-                    <div>
-                        <field name="use_timesheets"/>
-                        <button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
-                    </div>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_timesheets"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
+                    </tr>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/project.py b/addons/project/project.py
index 1162d51ad74..aa9316aec1b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -714,7 +714,7 @@ class task(base_stage, osv.osv):
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
-        'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+        'planned_hours': fields.float('Initially Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
         'effective_hours': fields.function(_hours_get, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
@@ -1222,7 +1222,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Management',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ebef8f6e6fe..d2edef8d7a8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -82,28 +82,24 @@
                     <h1>
                         <field name="name" string="Project Name"/>
                     </h1>
-                    <label for="parent_id" class="oe_edit_only" string="Parent Project"/>
-                    <h2>
-                        <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                    </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
-                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                         <group>
-                            <label for="use_tasks"/>
-                            <div name="Tasks">
-                                <field name="use_tasks"/>
-                                <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
-                            </div>
-                            <label string=""/>
-                            <div style="margin-left: 15px;">
-                              <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" />
-                            </div>
+                            <table>
+                                <tr name="use_tasks_row">
+                                    <td><group><field name="use_tasks"/></group></td>
+                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <td/>
+                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
                         </group>
                     </group>
                     <notebook>
@@ -138,6 +134,7 @@
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                                     <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                 </group>
                             </group>
                         </page>
@@ -403,11 +400,9 @@
                                     states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
-                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="cancelled" context="{'button_reactivate':True}"/>
+                                    states="cancelled,done" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending"/>
+                                    states="draft,open,pending" class="oe_highlight"/>
                             <button name="do_pending" string="Pending" type="object"
                                     states="open"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
@@ -416,7 +411,7 @@
                                     states="draft,open,pending"/>
                             <button name="stage_previous" string="Previous Stage" type="object"
                                     states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                            <button name="stage_next" string="Next Stage" type="object"
+                            <button name="stage_next" string="Next Stage" type="object" class="oe_highlight"
                                     states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         </span>
                         <field name="stage_id" widget="statusbar"/>
@@ -426,23 +421,16 @@
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id"  on_change="onchange_project(project_id)"/>
-                    </h2>
                     <group>
                         <group>
+                            <field name="project_id"  on_change="onchange_project(project_id)"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
-                            <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
-                                groups="project.group_time_work_estimation_tasks"
-                                on_change="onchange_planned(planned_hours, effective_hours)"/>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks"
-                                invisible="1"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
@@ -457,12 +445,11 @@
                                 </tree>
                             </field>
                             <group>
-                             <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
                              <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -491,6 +478,9 @@
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
+                                <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
+                                    groups="project.group_time_work_estimation_tasks"
+                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                         </page>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 5f4a1f95228..13e60ccd7be 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -119,25 +119,35 @@
                 <sheet string="Issue">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2><field name="project_id" required="True" on_change="on_change_project(project_id)"/></h2>
                     <group>
                         <group>
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                        </group><group>
-                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                            <field name="version_id" widget="selection"/>
+                        </group>
+                        <group>
                             <field name="priority"/>
-                            <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                            <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
+                            <label for="task_id"/>
+                            <div>
+                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline"/>
+                                <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
+                            </div>
                         </group>
                     </group>
-                    <field name="description" placeholder="Add a description..."/>
-
-                    <notebook groups="base.group_no_one">
-                        <page string="Extra Info">
+                    <notebook>
+                        <page string="Description">
+                            <group>
+                                <group>
+                                    <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                                </group>
+                                <group>
+                                    <field name="version_id" widget="selection"/>
+                                </group>
+                            </group>
+                            <field name="description" placeholder="Add a description..."/>
+                        </page>
+                        <page string="Extra Info" groups="base.group_no_one">
                             <group col="4" colspan="4">
                                 <separator string="Statistics" colspan="4" col="4"/>
                                 <field name="day_open"/>
@@ -387,12 +397,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="Tasks"]' position='after'>
-                    <label for="use_issues"/>
-                    <div>
-                        <field name="use_issues"/>
-                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
-                    </div>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_issues"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
+                    </tr>
                 </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7035c559a14..7d7310465d6 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -111,12 +111,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="Tasks"]' position='after'>
-                    <label for="use_phases"/>
-                    <div>
-                        <field name="use_phases"/>
-                        <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/>
-                    </div>
+                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
+                    <tr>
+                        <td><group><field name="use_phases"/></group></td>
+                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
+                    </tr>
                 </xpath>
             </field>
         </record>
@@ -156,20 +155,21 @@
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
-                        <label for="project_id" class="oe_edit_only"/>
-                        <h2>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
-                        </h2>
                     </div>
                     <group>
-                    <label for="date_start" string="Duration"/>
-                    <div>
-                        <div>
-                            <field name="duration" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline"/>
-                        </div>
-                        <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
-                    </div>
+                        <group>
+                            <label for="date_start" string="Duration"/>
+                            <div>
+                                <div>
+                                    <field name="duration" class="oe_inline"/>
+                                    <field name="product_uom" class="oe_inline"/>
+                                </div>
+                                <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Planning of Users">
@@ -209,10 +209,10 @@
                                <group>
                                     <field name="constraint_date_start"/>
                                     <field name="constraint_date_end"/>
-                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                                 <group>
                                     <field name="sequence"/>
+                                     <field name="user_force_ids" widget="many2many_tags"/>
                                 </group>
                             </group>
                            <separator string="Previous Phases"/>
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 9a7fadc4c82..5fed5b96218 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -262,8 +262,8 @@ class resource_calendar_attendance(osv.osv):
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
         'date_from' : fields.date('Starting Date'),
-        'hour_from' : fields.float('Work from', size=8, required=True, help="Start and End time of working.", select=True),
-        'hour_to' : fields.float("Work to", size=8, required=True),
+        'hour_from' : fields.float('Work from', required=True, help="Start and End time of working.", select=True),
+        'hour_to' : fields.float("Work to", required=True),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
     
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5766d811d85..1408b70fca7 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -233,27 +233,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <field name="resource_id" on_change="onchange_resource(resource_id)"/>
-                                <field name="name" string="Reason"/>
-                            </group>
-                            <group>
-                                <field name="calendar_id"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+                            <field name="name" string="Reason"/>
                         </group>
                         <group>
-                           <group>
-                             <label for="date_from" string="Duration"/> 
-                             <div>
-                               <field name="date_from" class="oe_inline"/>- 
-                               <field name="date_to" class="oe_inline"/>
-                             </div>
-                           </group>
+                            <field name="calendar_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
-                    </sheet>
+                    </group>
+                    <group>
+                       <group>
+                         <label for="date_from" string="Duration"/> 
+                         <div>
+                           <field name="date_from" class="oe_inline"/> - 
+                           <field name="date_to" class="oe_inline"/>
+                         </div>
+                       </group>
+                    </group>
                 </form>
             </field>
         </record>

From 940f27a4492f950facc32d0113218c9a9a73602d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 12 Jul 2012 17:26:35 +0200
Subject: [PATCH 42/42] [IMP] size of kanban columns

bzr revid: fp@tinyerp.com-20120712152635-3lb33yoxyaailakj
---
 addons/web/static/src/xml/base.xml           | 11 ++++++-----
 addons/web_kanban/static/src/css/kanban.css  |  8 ++------
 addons/web_kanban/static/src/css/kanban.sass |  7 ++-----
 addons/web_kanban/static/src/js/kanban.js    |  9 ++++++++-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index aa04df98f04..8acf63a97b8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -399,16 +399,17 @@
 <t t-name="ViewManager">
     <div class="oe_view_manager">
         <table class="oe_view_manager_header">
-            <col width="33%"/>
-            <col width="33%"/>
-            <col width="34%"/>
+            <col width="25%"/>
+            <col width="25%"/>
+            <col width="25%"/>
+            <col width="25%"/>
             <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                         <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
                             <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
                         </h2>
                 </td>
-                <td>
+                <td colspan="2">
                         <div class="oe_view_manager_view_search" t-opentag="true"/>
                 </td>
             </tr>
@@ -416,7 +417,7 @@
                 <td>
                         <div class="oe_view_manager_buttons"/>
                 </td>
-                <td>
+                <td colspan="2">
                         <div class="oe_view_manager_sidebar"/>
                 </td>
                 <td>
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index cd8a6da1d45..925df71f376 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -38,7 +38,6 @@
 }
 .openerp .oe_kanban_view .oe_kanban_groups {
   height: inherit;
-  width: 100%;
 }
 .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
   display: inline-block;
@@ -64,10 +63,10 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
-}
-.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   border-left: 1px solid #f0f8f8;
   border-right: 1px solid #b9b9b9;
+  min-width: 170px;
+  max-width: 250px;
 }
 .openerp .oe_kanban_view .oe_form .oe_kanban_column {
   padding: 0px;
@@ -79,9 +78,6 @@
 .openerp .oe_kanban_view .oe_kanban_aggregates {
   padding: 0;
 }
-.openerp .oe_kanban_view .oe_kanban_group_header {
-  position: relative;
-}
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column > *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
   display: none;
 }
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b3452b9356b..b1e32e35518 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -52,7 +52,6 @@
     // KanbanGroups {{{
     .oe_kanban_groups
         height: inherit
-        width: 100%
     .oe_kanban_header
         &:hover
             .oe_dropdown_kanban
@@ -76,10 +75,10 @@
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee
-
-    .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         border-left: 1px solid #f0f8f8
         border-right: 1px solid #b9b9b9
+        min-width: 170px
+        max-width: 250px
 
     .oe_form
         .oe_kanban_column
@@ -90,8 +89,6 @@
         height: 100%
     .oe_kanban_aggregates
         padding: 0
-    .oe_kanban_group_header
-        position: relative
     .oe_kanban_group_folded
         .oe_kanban_group_title, &.oe_kanban_column > *, .oe_kanban_aggregates, .oe_kanban_add
             display: none
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 3480418c755..5a22b9e5ba5 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -286,13 +286,20 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     compute_groups_width: function() {
         var unfolded = 0;
+        var self = this;
         _.each(this.groups, function(group) {
             unfolded += group.state.folded ? 0 : 1;
             group.$element.css('width', '');
         });
         _.each(this.groups, function(group) {
             if (!group.state.folded) {
-                group.$element.css('width', Math.round(100/unfolded) + '%');
+                if (182*unfolded>=self.$element.width()) {
+                    group.$element.css('width', "170px");
+                } else if (262*unfolded>self.$element.width()) {
+                    group.$element.css('width', Math.round(100/unfolded) + '%');
+                } else {
+                    group.$element.css('width', "250px");
+                }
             }
         });
     },