From 57911141bc9a14087767fe4be2915a5702e4c3e1 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 26 Sep 2011 18:43:23 +0200
Subject: [IMP] Move all installers into base_setup

bzr revid: stw@openerp.com-20110926164323-ob28bw1zgfmaih9c
---
 addons/base_setup/base_setup_views.xml | 123 ++++++++++++++++++++++++++++-----
 1 file changed, 107 insertions(+), 16 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a6059148b51..023ebd7d2c1 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -39,22 +39,113 @@
             <field name="marketing" groups="base.group_extended" />
             <field name="point_of_sale"/>
             <field name="report_designer" groups="base.group_extended" />
-            <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" />
-            <field name="auction" />
-            <field name="product_expiry" />
-            <group name="crm"/>
-            <group name="sale"/>
-            <group name="project"/>
-            <group name="knowledge"/>
-            <group name="mrp"/>
-            <group name="account_accountant"/>
-            <group name="purchase"/>
-            <group name="hr"/>
-            <group name="profile_tools"/>
-            <group name="marketing"/>
-            <group name="report_designer"/>
-            <group name="association"/>
+
+            <group name="crm" colspan="4">
+                <separator string="Customer Relationship Management Features" colspan="4"/>
+                <field name="crm_claim" groups="base.group_extended"/>
+                <field name="crm_helpdesk" groups="base.group_extended"/>
+                <field name="crm_fundraising" groups="base.group_extended"/>
+                <field name="wiki_sale_faq" groups="base.group_extended"/>
+                <field name="sale_crm" invisible="1" groups="base.group_extended"/>
+                <field name="crm_caldav"/>
+                <field name="import_sugarcrm"/>
+                <field name="fetchmail"/>
+                <field name="thunderbird"/>
+                <field name="outlook"/>
+            </group>
+            <group name="sale" colspan="4">
+                <separator string="Sales Management Features" colspan="4" />
+                <field name="delivery" />
+                <field name="sale_journal" />
+                <field name="sale_layout" />
+                <field name="sale_margin" />
+                <field name="sale_order_dates" />
+            </group>
+            <group name="project" colspan="4">
+                <separator string="Project Management Features" colspan="4" />
+                <field name="project_issue" />
+                <field name="project_long_term" />
+                <field name="hr_timesheet_sheet" />
+                <field name="project_timesheet" />
+                <field name="account_budget" />
+                <field name="project_scrum" />
+                <field name="project_gtd" />
+            </group>
+            <group name="knowledge" colspan="4">
+                <separator  string="Knowledge Management Features" colspan="4" />
+                <field name="document_ftp" />
+                <field name="document_webdav" />
+                <field name="wiki" />
+                <field name="wiki_faq" />
+                <field name="wiki_quality_manual" />
+                <field name="stock" />
+            </group>
+            <group name="mrp" colspan="4">
+                <separator  string="Manufacturing Features" colspan="4" />
+                <field name="stock_location" />
+                <field name="mrp_jit" />
+                <field name="mrp_operations" />
+                <field name="mrp_subproduct" />
+                <field name="mrp_repair" />
+                <field name="account_voucher" />
+            </group>
+            <group name="account_accountant" colspan="4">
+                <separator string="Accounting &amp; Finance Features" colspan="4"/>
+                <field name="account_followup"/>
+                <field name="account_payment"/>
+                <field name="account_analytic_plans"/>
+                <field name="account_anglo_saxon"/>
+                <field name="account_asset"/>
+                <field name="purchase" />
+            </group>
+
+            <group name="hr" colspan="4">
+                <separator string="Human Resources Features" colspan="4"/>
+                <field name="hr_holidays"/>
+                <field name="hr_expense"/>
+                <field name="hr_recruitment"/>
+                <field name="hr_timesheet_sheet"/>
+                <field name="hr_contract"/>
+                <field name="hr_attendance"/>
+                <field name="hr_evaluation"/>
+                <field name="hr_payroll"/>
+                <field name="hr_payroll_account" groups="base.group_extended"/>
+            </group>
+            <group name="profile_tools" colspan="4">
+                <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" />
+            </group>
+            <group name="marketing" colspan="4">
+                <separator  string="Marketing Features" colspan="4" />
+                <field name="marketing_campaign" />
+                <field name="email_template" />
+                <field name="crm_profiling" />
+                <field name="point_of_sale"/>
+            </group>
+            <group name="report_designer" colspan="4">
+                <separator  string="Advanced Reporting Features" colspan="4" />
+                <field name="base_report_designer" />
+                <field name="base_report_creator" />
+            </group>
+            <group name="association" colspan="4">
+                <separator  string="Associations Features" colspan="4" />
+                <field name="project_gtd" />
+                <field name="wiki" />
+                <field name="event_project" />
+                <field name="hr_expense" />
+                <field name="auction" />
+                <field name="product_expiry" />
+            </group>
+            <group name="purchase" colspan="4">
+                <separator  string="Purchase Management Features" colspan="4" />
+                <field name="purchase_requisition" />
+                <field name="purchase_analytic_plans" />
+            </group>
           </group>
         </data>
       </field>
-- 
cgit v1.2.3


From 14528b600e2a48f8b056d9999a1e9d989bc3b56b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 27 Sep 2011 17:47:25 +0200
Subject: [IMP] base_setup: add a new wizard

bzr revid: stw@openerp.com-20110927154725-l2tazrlqbjhslm1j
---
 addons/base_setup/base_setup_views.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 023ebd7d2c1..4fc0a075664 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,6 +1,18 @@
 <openerp>
   <data>
 
+      <record model="ir.actions.act_window" id="action_base_setup_installer2">
+          <field name="name">base.setup.installer2</field>
+          <field name="res_model">base.setup.installer2</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <record id="todo_base_setup_installer2" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_installer2" />
+      </record>
+
     <record id="view_base_setup_installer" model="ir.ui.view">
       <field name="name">base.setup.installer.view</field>
       <field name="model">base.setup.installer</field>
-- 
cgit v1.2.3


From c4d51e5acba9af43aee437e24b510a05df3137cc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:49:56 +0200
Subject: [IMP] base_setup: Set the default modules to load when the user
 selects a category [IMP] base_setup: Show the expert modules only if the user
 is in the extended group

bzr revid: stw@openerp.com-20110930154956-si1rkeiifhh90tqd
---
 addons/base_setup/base_setup_views.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4fc0a075664..ee2fb121a5d 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -2,7 +2,7 @@
   <data>
 
       <record model="ir.actions.act_window" id="action_base_setup_installer2">
-          <field name="name">base.setup.installer2</field>
+          <field name="name">Install Applications (beta)</field>
           <field name="res_model">base.setup.installer2</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
@@ -11,6 +11,8 @@
 
       <record id="todo_base_setup_installer2" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer2" />
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="sequence">2</field>
       </record>
 
     <record id="view_base_setup_installer" model="ir.ui.view">
-- 
cgit v1.2.3


From 8cf0d19c513b83179504daa1c8c249c38e8f426f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 21:21:15 +0200
Subject: [IMP] useability config wizards

bzr revid: fp@tinyerp.com-20111001192115-mgkx8mbmx34ps5xo
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a6059148b51..a27b3f36f99 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -119,7 +119,7 @@
                   <attribute name="string">Define default users preferences</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
+              <attribute name="string">This will set the default values for all users. After this, user will be free to update his own preferences.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
-- 
cgit v1.2.3


From d9dc20068892a75ce272d40a7c338805467402c1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:10:44 +0200
Subject: [IMP] useability views

bzr revid: fp@tinyerp.com-20111001201044-pmttdc810josm8a9
---
 addons/base_setup/base_setup_views.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index a27b3f36f99..97192b67339 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -225,21 +225,6 @@
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
     </record>
-    <!--   register Upload Logo configuration wizard  -->
-    <record id="base_setup_company_logo_action" model="ir.actions.act_window">
-      <field name="name">Upload Your Company Logo</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">res.company</field>
-      <field name="view_id" ref="base.view_company_form"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="context">{'res_id': user.company_id.id}</field>
-    </record>
-    <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
-        <field name="action_id" ref="base_setup_company_logo_action"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="state">done</field>
-    </record>
 
   </data>
 </openerp>
-- 
cgit v1.2.3


From ff615022729d20b64680f9ec9f15639d7893d114 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:15:29 +0200
Subject: [IMP] some view should not have group_by...

bzr revid: fp@tinyerp.com-20111001211529-0g2jccon81tbjrry
---
 addons/base_setup/base_setup_views.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 97192b67339..9c832f1b7cb 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -156,14 +156,13 @@
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">res.users</field>
           <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="view_id" ref="base.view_users_form"/>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" eval="False"/>
       </record>
       <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
           <field name="action_id" ref="action_config_access_other_user"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="sequence">1000</field>
-          <field name="state">done</field>
       </record>
 
 
-- 
cgit v1.2.3


From 2974459cb6da49fb477ee475a980743301c1f740 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:18:13 +0200
Subject: [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001211813-qr5ova5jfecto9j7
---
 addons/base_setup/base_setup_views.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 9c832f1b7cb..6824de60bcb 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -113,13 +113,13 @@
           <field name="arch" type="xml">
             <data>
               <form position="attributes">
-                <attribute name="string">Define default users preferences</attribute>
+                <attribute name="string">Define Users's Preferences</attribute>
               </form>
             <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <attribute name="string">Define default users preferences</attribute>
+                  <attribute name="string">Define Users's Preferences</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">This will set the default values for all users. After this, user will be free to update his own preferences.</attribute>
+              <attribute name="string">This will set the default preferences for all users. After this, each user will be able to update his own preferences.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
-- 
cgit v1.2.3


From 1475aa0ea1388159cf86c08ad07d7eed5e33d466 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 00:38:26 +0200
Subject: [IMP] removing add more features from SC, as it's in config panel

bzr revid: fp@tinyerp.com-20111001223826-twjo397gb00bt9gi
---
 addons/base_setup/base_setup_views.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 6824de60bcb..bf40e511eaa 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -82,12 +82,6 @@
     </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="100"/>
-    <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">
-- 
cgit v1.2.3


From 730230f7ac9fb4191e8b47acf106a88b423326ec Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 13:51:45 +0200
Subject: [IMP] config wizard launch policy

bzr revid: fp@tinyerp.com-20111002115145-fdqzn5eic83z9fd7
---
 addons/base_setup/base_setup_views.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index bf40e511eaa..2a1ff256d0e 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -142,6 +142,7 @@
       <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
       </record>
 
       <!-- Create Additional Users  -->
@@ -201,6 +202,7 @@
       <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
+          <field name="type">once</field>
       </record>
 
     <!-- Company config -->
-- 
cgit v1.2.3


From 81f4199fe636dfbca853860b8cdc0338ed8b6604 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 2 Oct 2011 14:59:58 +0200
Subject: [IMP] config wizards useability

bzr revid: fp@tinyerp.com-20111002125958-uh8ubpli8izpxqyw
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 2a1ff256d0e..2e2808d9ff4 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -176,7 +176,7 @@
                   <attribute name="string">Specify Your Terminology</attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Based on the industry needs you can use this wizard to change the terminologies for Partners. </attribute>
+              <attribute name="string">You can use this wizard to change the terminologies for customers in the whole application.</attribute>
             </xpath>
             <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
                   <attribute name="string"/>
-- 
cgit v1.2.3


From b916762b26a8affc3de592936f335b013de2d48f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:06:56 +0200
Subject: [REF] Remove old codes

bzr revid: stw@openerp.com-20111003120656-5kje5dgpulhz4a9u
---
 addons/base_setup/base_setup_views.xml | 172 +--------------------------------
 1 file changed, 4 insertions(+), 168 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index ee2fb121a5d..f35ca95e529 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,184 +1,20 @@
 <openerp>
   <data>
 
-      <record model="ir.actions.act_window" id="action_base_setup_installer2">
+      <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
           <field name="name">Install Applications (beta)</field>
-          <field name="res_model">base.setup.installer2</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="todo_base_setup_installer2" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_installer2" />
+      <record id="todo_base_setup_installer_beta" 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="view_base_setup_installer" model="ir.ui.view">
-      <field name="name">base.setup.installer.view</field>
-      <field name="model">base.setup.installer</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
-          </xpath>
-          <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                    <attribute name="rowspan">15</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Install</attribute>
-          </xpath>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Applications</attribute>
-          </separator>
-          <group colspan="8">
-            <field name="crm" />
-            <field name="sale" />
-            <field name="project" />
-            <field name="knowledge" />
-            <field name="stock" />
-            <field name="mrp" />
-            <field name="account_voucher" />
-            <field name="account_accountant" />
-            <field name="purchase" />
-            <field name="hr" />
-            <field name="profile_tools" />
-            <field name="marketing" groups="base.group_extended" />
-            <field name="point_of_sale"/>
-            <field name="report_designer" groups="base.group_extended" />
-
-            <group name="crm" colspan="4">
-                <separator string="Customer Relationship Management Features" colspan="4"/>
-                <field name="crm_claim" groups="base.group_extended"/>
-                <field name="crm_helpdesk" groups="base.group_extended"/>
-                <field name="crm_fundraising" groups="base.group_extended"/>
-                <field name="wiki_sale_faq" groups="base.group_extended"/>
-                <field name="sale_crm" invisible="1" groups="base.group_extended"/>
-                <field name="crm_caldav"/>
-                <field name="import_sugarcrm"/>
-                <field name="fetchmail"/>
-                <field name="thunderbird"/>
-                <field name="outlook"/>
-            </group>
-            <group name="sale" colspan="4">
-                <separator string="Sales Management Features" colspan="4" />
-                <field name="delivery" />
-                <field name="sale_journal" />
-                <field name="sale_layout" />
-                <field name="sale_margin" />
-                <field name="sale_order_dates" />
-            </group>
-            <group name="project" colspan="4">
-                <separator string="Project Management Features" colspan="4" />
-                <field name="project_issue" />
-                <field name="project_long_term" />
-                <field name="hr_timesheet_sheet" />
-                <field name="project_timesheet" />
-                <field name="account_budget" />
-                <field name="project_scrum" />
-                <field name="project_gtd" />
-            </group>
-            <group name="knowledge" colspan="4">
-                <separator  string="Knowledge Management Features" colspan="4" />
-                <field name="document_ftp" />
-                <field name="document_webdav" />
-                <field name="wiki" />
-                <field name="wiki_faq" />
-                <field name="wiki_quality_manual" />
-                <field name="stock" />
-            </group>
-            <group name="mrp" colspan="4">
-                <separator  string="Manufacturing Features" colspan="4" />
-                <field name="stock_location" />
-                <field name="mrp_jit" />
-                <field name="mrp_operations" />
-                <field name="mrp_subproduct" />
-                <field name="mrp_repair" />
-                <field name="account_voucher" />
-            </group>
-            <group name="account_accountant" colspan="4">
-                <separator string="Accounting &amp; Finance Features" colspan="4"/>
-                <field name="account_followup"/>
-                <field name="account_payment"/>
-                <field name="account_analytic_plans"/>
-                <field name="account_anglo_saxon"/>
-                <field name="account_asset"/>
-                <field name="purchase" />
-            </group>
-
-            <group name="hr" colspan="4">
-                <separator string="Human Resources Features" colspan="4"/>
-                <field name="hr_holidays"/>
-                <field name="hr_expense"/>
-                <field name="hr_recruitment"/>
-                <field name="hr_timesheet_sheet"/>
-                <field name="hr_contract"/>
-                <field name="hr_attendance"/>
-                <field name="hr_evaluation"/>
-                <field name="hr_payroll"/>
-                <field name="hr_payroll_account" groups="base.group_extended"/>
-            </group>
-            <group name="profile_tools" colspan="4">
-                <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" />
-            </group>
-            <group name="marketing" colspan="4">
-                <separator  string="Marketing Features" colspan="4" />
-                <field name="marketing_campaign" />
-                <field name="email_template" />
-                <field name="crm_profiling" />
-                <field name="point_of_sale"/>
-            </group>
-            <group name="report_designer" colspan="4">
-                <separator  string="Advanced Reporting Features" colspan="4" />
-                <field name="base_report_designer" />
-                <field name="base_report_creator" />
-            </group>
-            <group name="association" colspan="4">
-                <separator  string="Associations Features" colspan="4" />
-                <field name="project_gtd" />
-                <field name="wiki" />
-                <field name="event_project" />
-                <field name="hr_expense" />
-                <field name="auction" />
-                <field name="product_expiry" />
-            </group>
-            <group name="purchase" colspan="4">
-                <separator  string="Purchase Management Features" colspan="4" />
-                <field name="purchase_requisition" />
-                <field name="purchase_analytic_plans" />
-            </group>
-          </group>
-        </data>
-      </field>
-    </record>
-    <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Install Applications</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.setup.installer</field>
-      <field name="view_id" ref="view_base_setup_installer"/>
-      <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"/>
-        <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"/>
-- 
cgit v1.2.3


From bdbd19fa8674af370989b5a34bf831e74e7881dd Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:27:13 +0200
Subject: [FIX] base_setup: rename the action of the new base.setup.installer
 wizard

bzr revid: stw@openerp.com-20111003122713-smjc6vtxku57glur
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 2fc041c63a3..1a6fa9a91fa 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -2,7 +2,7 @@
   <data>
 
       <record model="ir.actions.act_window" id="action_base_setup_installer_beta">
-          <field name="name">Install Applications (beta)</field>
+          <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>
-- 
cgit v1.2.3


From 0815eff444ae35170b5682e91167df6b37d6c721 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 4 Oct 2011 15:36:13 +0200
Subject: [FIX] base_setup: fix the xml_id of the default shortcut 'Add More
 Features'

bzr revid: stw@openerp.com-20111004133613-d2pv1csgin2bwfee
---
 addons/base_setup/base_setup_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 1a6fa9a91fa..12b3246ad61 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,7 +9,7 @@
           <field name="target">new</field>
       </record>
 
-      <record id="todo_base_setup_installer_beta" model="ir.actions.todo">
+      <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>
-- 
cgit v1.2.3


From b8f9bad1a12ddd93ac0e86a0e08631bdb2f58a32 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:58:55 +0200
Subject: [IMP] base_setup: Add the shortcut 'Add More Features' and reindent
 the code

bzr revid: stw@openerp.com-20111005145855-hu14h1whjiv669iq
---
 addons/base_setup/base_setup_views.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 12b3246ad61..01051c4cc60 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,20 +9,27 @@
           <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>
+          <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>
+      <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="100"/>
+      <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="100"/>
+      <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">
-- 
cgit v1.2.3