From ac94300f0fc56223b1dfd9f78f4d3abdd927c7c6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 25 Apr 2012 16:42:58 +0200
Subject: [PATCH] [IMP] base_*, email_template, fetchmail, mail, import_*:
 remove group_extended

bzr revid: rco@openerp.com-20120425144258-jpb9xey20h7fq4tx
---
 .../base_action_rule_view.xml                 |  4 ----
 .../wizard/base_module_record_object_view.xml |  3 +--
 addons/base_vat/base_vat_view.xml             |  4 ++--
 addons/email_template/email_template_view.xml |  2 +-
 addons/email_template/res_partner_view.xml    |  4 ++--
 addons/fetchmail/fetchmail_view.xml           |  6 ++---
 .../sync_google_calendar_view.xml             |  6 ++---
 .../import_sugarcrm/import_sugarcrm_view.xml  |  2 +-
 addons/mail/mail_message_view.xml             | 22 +++++++++----------
 9 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 65b37fb4c1d..4ba7e6f9018 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-       <!--   <menuitem id="base.menu_base_action_rule" name="Automated Actions"
-            groups="base.group_extended"
-            parent="base.menu_base_config" sequence="20" />-->
         <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
-            groups="base.group_extended"
             parent="base.menu_custom" />
 
         <!--
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 11cec50bb50..4b63cb8d50e 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -35,8 +35,7 @@
         <menuitem
             parent="base.menu_custom"
             name="Module Creation"
-            id="menu_wizard_base_mod_rec"
-            groups="base.group_extended"/>
+            id="menu_wizard_base_mod_rec"/>
             
         <menuitem
             parent="menu_wizard_base_mod_rec"
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index 18480b47814..94b99af8443 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -11,7 +11,7 @@
                     <group colspan="2" col="6">
                         <field name="vat" on_change="vat_change(vat)"/>
                         <button name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
-                        <field name="vat_subjected" colspan="1" groups="base.group_extended" />
+                        <field name="vat_subjected" colspan="1" />
                     </group>
                 </field>
             </field>
@@ -23,7 +23,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
-                    <field name="vat_check_vies" groups="base.group_extended" />
+                    <field name="vat_check_vies" />
                 </field>
             </field>
         </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index ef6451a9736..a90856d53c3 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -76,7 +76,7 @@
                                             help="Remove the sidebar button currently displayed on related documents"
                                             />
                                 </group>
-                                <group colspan="2" col="2" groups="base.group_extended">
+                                <group colspan="2" col="2">
                                     <separator string="Advanced Options" colspan="2"/>
                                     <field name="mail_server_id"/>
                                     <field name="track_campaign_item"/>
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 0d2f919a96e..21269443511 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -8,9 +8,9 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='active']" position="after">
-                    <field name="opt_out" groups="base.group_extended"/>
+                    <field name="opt_out"/>
                 </xpath>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 3344183a92a..3d9acf2bbd5 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -46,7 +46,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Actions to Perform on Incoming Mails" colspan="2"/>
                                 <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
-                                <field name="action_id" groups="base.group_extended"/>
+                                <field name="action_id"/>
                             </group>
                             <group attrs="{'invisible' : [('type', '!=', 'local')]}" colspan="4" col="4">
                                 <separator string="Configuration" colspan="4"/>
@@ -54,10 +54,10 @@
                                 <field name="script" colspan="4" widget="url"/>
                             </group>
                         </page>
-                        <page string="Advanced" groups="base.group_extended">
+                        <page string="Advanced" groups="base.group_no_one">
                             <group colspan="2" col="2">
                                 <separator string="Advanced options" colspan="2"/>
-                                <field name="priority" groups="base.group_extended"/>
+                                <field name="priority"/>
                                 <field name="attach"/>
                                 <field name="original"/>
                                 <field name="active" select="1"/>
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 58e1e55efd0..8b51576edac 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -9,7 +9,7 @@
 	        <field name="arch" type="xml">
 		        <field name="categ_id" position="replace">
 		           <field name="categ_id" widget="selection"
-	                      string="Meeting Type" groups="base.group_extended"
+	                      string="Meeting Type"
 	                      domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
 		        </field>
 		    </field>
@@ -23,10 +23,10 @@
 	        <field name="arch" type="xml">
 	           <field name="categ_id" position="replace">
                    <field name="categ_id" widget="selection"
-                          string="Meeting Type" groups="base.group_extended"
+                          string="Meeting Type"
                           domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
                 </field>
 	        </field>
 	    </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index f90451c69f5..e87cd3172a0 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -75,7 +75,7 @@
               <group colspan="4" col="6">
                 <label string="" colspan="2"/>
                 <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                <button name="import_from_scheduler_all" groups="base.group_extended" string="_Schedule Recurrent Imports"
+                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
                         type="object" icon="gtk-execute" />
                 <button name="import_all" string="_Import"
                         type="object" icon="terp-camera_test"/>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index ecd106e05e5..50993f93744 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -91,16 +91,16 @@
                                 <field name="email_from"/>
                                 <field name="email_to"/>
                                 <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                <field name="email_bcc" groups="base.group_extended" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
                                 <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
                             </group>
                             <group col="4" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
                                 <field name="model"/>
                                 <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
-                                <field name="res_id" groups="base.group_extended"/>
-                                <field name="message_id" groups="base.group_extended" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
-                                <field name="references" colspan="4" widget="char" size="512" groups="base.group_extended" attrs="{'invisible':[('references', '=', False)]}"/>
+                                <field name="res_id"/>
+                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
@@ -124,7 +124,7 @@
                             <separator string="Attachments" colspan="4"/>
                             <field name="attachment_ids" nolabel="1" colspan="4"/>
                         </page>
-                        <page string="Advanced" groups="base.group_extended">
+                        <page string="Advanced" groups="base.group_no_one">
                             <group col="2" colspan="4">
                                 <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
                                 <field name="auto_delete"/>
@@ -182,14 +182,14 @@
                     <field name="subject"/>
                     <field name="date"/>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="user_id" string="User"/>
-                    <field name="partner_id" string="Partner Name"/>
-                    <field name="model"/>
-                    <field name="res_id"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="user_id" string="User"/>
+                        <field name="partner_id" string="Partner Name"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>