[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

1 files changed, 1 insertions, 30 deletions

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index d3536b10cf1..9450057f53f 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,36 +1,6 @@
 <openerp>
   <data>
 
-      <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
-          <field name="name">Install Applications</field>
-          <field name="res_model">base.setup.installer</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-
-
-      <record id="base_setup_installer_todo" model="ir.actions.todo">
-          <field name="action_id" ref="action_base_setup_installer_beta" />
-          <field name="category_id" ref="base.category_administration_config"/>
-          <field name="sequence">2</field>
-      </record>
-
-      <record id="action_start_configurator" model="ir.actions.server">
-          <field name="name">Start Configuration</field>
-          <field name="model_id" ref="base.model_ir_actions_todo"/>
-          <field name="state">code</field>
-          <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
-      </record>
-
-      <menuitem name="Add More Features" action="action_start_configurator" id="menu_view_base_module_configuration" parent="base.menu_config" type="server" icon="STOCK_EXECUTE" sequence="1"/>
-      <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
-          <field name="name">Add More Features</field>
-          <field name="resource">ir.ui.menu</field>
-          <field name="user_id" ref="base.user_root"/>
-          <field name="res_id" ref="menu_view_base_module_configuration" />
-      </record>
-
      <!-- Import or create customers configartion view  -->
      <record id="action_import_create_installer" model="ir.actions.act_window">
          <field name="name">Create or Import Customers</field>
@@ -162,6 +132,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="context">{'res_id': user.company_id.id}</field>
+      <field name="help">Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.</field>
     </record>
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>