[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb

4 files changed, 5 insertions, 71 deletions

diff --git a/addons/profile_tools/__init__.py b/addons/profile_tools/__init__.py
index 3511d091ecb..9a3d6d2fbb6 100644
--- a/addons/profile_tools/__init__.py
+++ b/addons/profile_tools/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import installer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 46528337f98..bd8790d1496 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -21,28 +21,27 @@
 
 
 {
-    "name" : "Miscellaneous Tools",
+    "name" : "Miscellaneous Hidden",
     "version" : "1.0",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category" : "Tools",
+    "category" : "Hidden",
     'complexity': "easy",
     "description": """
-Installer for extra tools like lunch, survey, idea, share, etc.
+Installer for extra Hidden like lunch, survey, idea, share, etc.
 ===============================================================
 
-Makes the Extra Tools Configuration available from where you can install
+Makes the Extra Hidden Configuration available from where you can install
 modules like share, lunch, pad, idea, survey and subscription.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
-        'misc_tools_installer.xml',
     ],
     'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate' : '00557100228403879621',
-    'images': ['images/config_extra_tools.jpeg'],
+    'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
deleted file mode 100644
index 44258234d11..00000000000
--- a/addons/profile_tools/installer.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class misc_tools_installer(osv.osv_memory):
-    _inherit = 'base.setup.installer'
-
-    _columns = {
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
-            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="This module creates a tighter integration between a Pad "
-                 "instance of your choosing and your OpenERP Web Client by "
-                 "letting you easily link pads to OpenERP objects via "
-                 "OpenERP attachments."),
-    }
-misc_tools_installer()
-
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
deleted file mode 100644
index 703a8aed9c7..00000000000
--- a/addons/profile_tools/misc_tools_installer.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_misc_tools_installer" model="ir.ui.view">
-      <field name="name">misc_tools.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <xpath expr="//group[@name='profile_tools']" position="replace">
-            <newline/>
-            <separator  string="Extra Tools Features" colspan="4" />
-            <field name="share" />
-            <field name="lunch" />
-            <field name="idea" />
-            <field name="survey" />
-            <field name="subscription" />
-            <field name="pad" />
-          </xpath>
-        </data>
-      </field>
-    </record>
-  </data>
-</openerp>