From f40c454fe4558dbf40222b04263fc3cd79ab9bef Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 3 Aug 2011 10:16:20 +0200
Subject: [PATCH] adapt inherited views to new users form

bzr revid: rco@openerp.com-20110803081620-kzl9agsl7900tsdd
---
 addons/crm/crm_view.xml          |  4 ++--
 addons/hr/hr_department_view.xml |  4 ++--
 addons/portal/res_user_view.xml  |  2 +-
 addons/project/project_view.xml  |  6 +++---
 addons/share/share_view.xml      | 19 ++++---------------
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 857ce086c70..5b8abc77461 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -366,9 +366,9 @@
                 <field name="inherit_id" ref="base.view_users_form"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
-                    <xpath expr="/form/notebook" position="before">
+                    <group name="default_filters" position="inside">
                         <field name="context_section_id" completion="1" widget="selection"/>
-                    </xpath>
+                    </group>
                 </field>
         </record>
 
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 9ff34269373..9fdb64651f5 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -71,9 +71,9 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook" position="before">
+                <group name="default_filters" position="inside">
                     <field name="context_department_id" completion="1" widget="selection" string="Department"/>
-                </xpath>
+                </group>
             </field>
         </record>
         <record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
diff --git a/addons/portal/res_user_view.xml b/addons/portal/res_user_view.xml
index 716493f2787..492c2ec5559 100644
--- a/addons/portal/res_user_view.xml
+++ b/addons/portal/res_user_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="before">
+                <field name="active" position="before">
                     <field name="partner_id"/>
                 </field>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 10dd89b846a..dbed52c6a25 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -546,9 +546,9 @@
           <field name="inherit_id" ref="base.view_users_form"/>
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
-              <xpath expr="/form/notebook" position="before">
+              <group name="default_filters" position="inside">
                    <field name="context_project_id"/>
-              </xpath>
+              </group>
           </field>
      </record>
 
@@ -560,7 +560,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <group name="default_filters" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
+                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
             </group>
        </field>
     </record>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
index 4b93e4a52ff..98a10a3cec8 100644
--- a/addons/share/share_view.xml
+++ b/addons/share/share_view.xml
@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>   
-    <record id="view_groups_form" model="ir.ui.view">
+        <record id="view_groups_form" model="ir.ui.view">
             <field name="name">res.groups.form</field>
             <field name="model">res.groups</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <field name="name" position="after">
+                <group name="default_filters" position="inside">
                     <field name="share"/>
-                </field>
+                </group>
             </field>
-    </record>
-    <record id="view_users_form" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook" position="before">
-                    <field name="share"/>
-                </xpath>
-            </field>
-    </record>
+        </record>
     </data>
 </openerp>