From 72a685bc8ec5a2fde86ec8f0837bdb71a3e17bff Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Apr 2012 16:46:11 +0200
Subject: [PATCH] [IMP] multi_company, point_of_sale: remove group_extended

bzr revid: rco@openerp.com-20120425144611-hk2y9euk5kigqx46
---
 addons/multi_company/multi_company_demo.xml | 10 +++++-----
 addons/multi_company/res_company_view.xml   |  1 -
 addons/point_of_sale/point_of_sale_view.xml |  6 +++---
 addons/point_of_sale/wizard/pos_payment.xml |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 063ee9b8544..766733034b7 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -65,7 +65,7 @@
             <field name="login">editor_demo</field>
             <field name="company_id" ref="res_company_oerp_editor"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
         </record>
         <record id="res_users_sales_demo_us" model="res.users">
             <field name="password">sales_demo_us</field>
@@ -73,7 +73,7 @@
             <field name="login">sales_demo_us</field>
             <field name="company_id" ref="res_company_oerp_us"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
         </record>
         <record id="res_users_sales_demo_be" model="res.users">
             <field name="password">sales_demo_be</field>
@@ -81,7 +81,7 @@
             <field name="login">sales_demo_be</field>
             <field name="company_id" ref="res_company_oerp_be"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
         </record>
         <record id="res_users_sales_demo_in" model="res.users">
             <field name="password">sales_demo_in</field>
@@ -89,7 +89,7 @@
             <field name="login">sales_demo_in</field>
             <field name="company_id" ref="res_company_oerp_in"/>
             <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
         </record>
         <record id="res_users_odoo_demo" model="res.users">
             <field name="password">odoo_demo</field>
@@ -97,7 +97,7 @@
             <field name="login">odoo_demo</field>
             <field name="company_id" ref="res_company_odoo"/>
             <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
         </record>
 
 
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index b246a1914d7..db0be0d09f4 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -68,7 +68,6 @@
         <menuitem id="menu_custom_multicompany"
             name="Multi-Companies"
             parent="base.menu_custom"
-            groups="base.group_extended"
             sequence="50"/>
 
         <menuitem id="menu_action_inventory_form" 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b397bd826cc..2622c2ba863 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -74,14 +74,14 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Extra Info" groups="base.group_extended">
+                        <page string="Extra Info">
                             <group colspan="2" col="2">
                                 <separator string="General Information" colspan="2"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"/>
                                 <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
-                                <field name="picking_id" readonly="1" groups="base.group_extended"/>
+                                <field name="picking_id" readonly="1"/>
                             </group>
                             <group colspan="2" col="3">
                                 <separator string="Accounting Information" colspan="3"/>
@@ -146,7 +146,7 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator string="" orientation="vertical"/>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 212c0d8c412..b790d2bac0f 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,7 +12,7 @@
                     <group colspan="4">
                         <field name="journal"/>
                         <field name="amount" />
-                        <field name="payment_name" groups="base.group_extended"/>
+                        <field name="payment_name"/>
                     </group>
                     <newline/>
                     <separator colspan="4"/>