From 4941e9e4317e0d6a0b14234501cca208e4d53aa3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 16:15:27 +0530
Subject: [IMP]Base Setup:Create New Conf wiz- Migrate data from another
 application

bzr revid: aag@tinyerp.co.in-20110407104527-hf08x01bfwhlph8c
---
 addons/base_setup/base_setup_installer.xml | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 13906abe6ba..a36d4213650 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -63,5 +63,55 @@
         <field name="sequence">2</field>
         <field name="restart">always</field>
     </record>
+    
+<!--     Migrate data from another application Conf Wiz-->
+
+    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
+        <field name="name">migrade.application.installer.modules.form</field>
+        <field name="model">migrade.application.installer.modules</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">Migrate data from another application</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                     <attribute name="string">Migrate data from another application</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='string'></attribute>
+                </xpath>
+                <group colspan="8">
+                    <field name="import_saleforce"/>
+                    <field name="import_sugarcrm"/>
+                    <field name="sync_google_contact"/>
+                    <field name="quickbooks_ippids"/>
+                </group>
+            </data>
+        </field>
+    </record>
+    
+    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
+	     <field name="name">Migrate data from another application</field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">migrade.application.installer.modules</field>
+	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">form</field>
+	     <field name="target">new</field>
+   </record>
+ 
+   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_migrade_application_installer_modules"/>
+      <field name="restart">always</field>
+  </record>
+       
   </data>
 </openerp>
-- 
cgit v1.2.3


From 228ac9aaf60190fef317a6ee8fb73c0e28738081 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 7 Apr 2011 18:59:30 +0530
Subject: [IMP]Base Setup:Create New Conf wiz- Import or create customers

bzr revid: aag@tinyerp.co.in-20110407132930-4r2kywrleb41aclb
---
 addons/base_setup/base_setup_installer.xml | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index a36d4213650..9255efdac07 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -1,5 +1,6 @@
 <openerp>
   <data>
+  
     <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>
@@ -112,6 +113,56 @@
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="restart">always</field>
   </record>
+  
+          <!-- Import or create customers configartion view  -->
+
+	 <record id="view_import_create_installer" model="ir.ui.view">
+	     <field name="name">Import or create customers </field>
+	     <field name="model">product.installer</field>
+	     <field name="type">form</field>
+	     <field name="inherit_id" ref="base.res_config_view_base"/>
+	     <field name="arch" type="xml">
+	       <data>
+	         <form position="attributes">
+	           <attribute name="string">Import or create customers </attribute>
+	         </form>
+	         <separator string="title" position="attributes">
+	         <attribute name="string">Import or create customers </attribute>
+	           </separator>
+	         <xpath expr="//label[@string='description']"
+                 position="attributes">
+                <attribute name="string">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</attribute>
+              </xpath>
+	         <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	               <attribute name='rowspan'>15</attribute>
+	               <attribute name='string'></attribute>
+	          </xpath>
+	           
+	           <group string="res_config_contents" position="replace">
+	               <group colspan="4">
+	                   <field colspan="4" name="customers" width="200"/>
+	             </group>
+	         </group>
+	       </data>
+	     </field>
+	 </record>
+	
+	 <record id="action_import_create_installer" model="ir.actions.act_window">
+	     <field name="name">Import or create customers </field>
+	     <field name="type">ir.actions.act_window</field>
+	     <field name="res_model">product.installer</field>
+	     <field name="view_id" ref="view_import_create_installer"/>
+	     <field name="view_type">form</field>
+	     <field name="view_mode">form</field>
+	     <field name="target">new</field>
+	 </record>
+
+    <!--          register configuration wizard -->
+	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
+	    <field name="action_id" ref="action_import_create_installer"/>
+	    <field name="restart">never</field>
+	    <field name="state">skip</field>
+	</record>
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 767f6571dc13fc3253d6bcddef233586493d26f2 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 8 Apr 2011 17:58:11 +0530
Subject: [IMP]ADDONS:Change Field Restart To Type

bzr revid: aag@tinyerp.co.in-20110408122811-dm029nwtkmjzcgdj
---
 addons/base_setup/base_setup_installer.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 9255efdac07..e37a9eabee0 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -62,7 +62,7 @@
     <record id="base_setup_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="sequence">2</field>
-        <field name="restart">always</field>
+        <field name="type">normal_recurring</field>
     </record>
     
 <!--     Migrate data from another application Conf Wiz-->
@@ -111,7 +111,7 @@
  
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="restart">always</field>
+      <field name="type">normal_recurring</field>
   </record>
   
           <!-- Import or create customers configartion view  -->
@@ -160,7 +160,7 @@
     <!--          register configuration wizard -->
 	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="restart">never</field>
+	    <field name="type">normal</field>
 	    <field name="state">skip</field>
 	</record>
        
-- 
cgit v1.2.3


From abc14b81ef4709d3dd0c02513d59f2fae7c4aa3d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 10:51:35 +0530
Subject: [IMP]Base_setup:Type=normal_recurring Import or create customers
 confg wiz

bzr revid: aag@tinyerp.co.in-20110412052135-cesfkui01qm9erz8
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e37a9eabee0..ac50611dd7e 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -160,7 +160,7 @@
     <!--          register configuration wizard -->
 	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="type">normal</field>
+	    <field name="type">normal_recurring</field>
 	    <field name="state">skip</field>
 	</record>
        
-- 
cgit v1.2.3


From 02e9b399c458a1258b373966cc4d6c7754a5974b Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 10:56:41 +0530
Subject: [IMP]Base_setup:Type:normal Migrate data from another application
 confg wiz

bzr revid: aag@tinyerp.co.in-20110412052641-vweitf6mf0b4o1jj
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ac50611dd7e..4d144bc0229 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -111,7 +111,7 @@
  
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="type">normal_recurring</field>
+      <field name="type">normal</field>
   </record>
   
           <!-- Import or create customers configartion view  -->
-- 
cgit v1.2.3


From 2866ce884c55a04d03e31ebe32a62a1170933386 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 14:39:20 +0530
Subject: [IMP]Base_setup:ADD Define default users preferences confg wiz From
 Addonse side

bzr revid: aag@tinyerp.co.in-20110412090920-k12klyll0vedx4u3
---
 addons/base_setup/base_setup_installer.xml | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 4d144bc0229..78c37eff038 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -163,6 +163,58 @@
 	    <field name="type">normal_recurring</field>
 	    <field name="state">skip</field>
 	</record>
+	
+	<!--        Define default users preferences-->
+
+     <record id="view_user_preferences_config_form" model="ir.ui.view">
+          <field name="name">Define default users preferences</field>
+          <field name="model">user.preferences.config</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+          <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Define default users preferences</attribute>
+              </form>
+            <xpath expr='//separator[@string="title"]' position='attributes'>
+                  <attribute name='string'>Define default users preferences</attribute>
+            </xpath>
+            <xpath expr="//label[@string='description']"
+               position="attributes">
+              <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
+            </xpath>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                  <attribute name='string'></attribute>
+                  <attribute name='rowspan'>12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="view" />
+                        <field colspan="4" name="context_lang" />
+                        <field colspan="4" name="context_tz" />
+                        <field colspan="4" name="menu_tips" />
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+
+      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
+          <field name="name">Define default users preferences</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">user.preferences.config</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="view_user_preferences_config_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <!--   Register configuration wizard -->
+      
+      <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_user_preferences_config_form"/>
+          <field name="type">normal</field>
+      </record>
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 3b0744e86c5047edecf52e4966a0a094e65b3e51 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 12 Apr 2011 15:10:47 +0530
Subject: [IMP]Base_setup:ADD Give access to others users wiz - Addonse side

bzr revid: aag@tinyerp.co.in-20110412094047-5mtb1zwj7g0gjoa8
---
 addons/base_setup/base_setup_installer.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 78c37eff038..81183b2fdd6 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -215,6 +215,27 @@
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="type">normal</field>
       </record>
+      
+      <!--     Config Wiz   Give access to others users   -->
+        
+      <record id="action_config_access_other_user" model="ir.actions.act_window">
+          <field name="name">Give access to others users</field>
+          <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"/>
+      </record>
+      
+      <!--   register configuration wizard  -->
+
+      <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_config_access_other_user"/>
+          <field name="type">normal</field>
+          <field name="target">current</field>
+          <field name="sequence">1000</field>
+          <field name="state">cancel</field>
+      </record>
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 18621c00e611f6d5a0c6666dc7ebec5f7163ccd4 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 13 Apr 2011 16:20:56 +0530
Subject: [IMP]Base_setup:ADD Uplode LOGO WIZ to  Addonse side

bzr revid: aag@tinyerp.co.in-20110413105056-elz1a907ida6yx9j
---
 addons/base_setup/base_setup_installer.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 81183b2fdd6..65665af9a52 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -236,6 +236,33 @@
           <field name="sequence">1000</field>
           <field name="state">cancel</field>
       </record>
+      
+      <!--      Inherit company Form -->
+
+      <record id="view_inherit_res_company_logo" model="ir.ui.view">
+          <field name="name">Upload Logo11</field>
+          <field name="model">res.company</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.view_company_form" />
+          <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//page[@string='General Information']" position="replace">
+                    <page string="General Information">
+	                    <group colspan="4">
+                            <field name="rml_header1" colspan="4"/>
+                            <field name="rml_footer1" colspan="4"/>
+                            <field name="rml_footer2" colspan="4"/>
+                            <field name="currency_id" colspan="2"/>
+	                     </group>
+	                     <separator string="" colspan="4"/>
+	                     <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
+	                     <button name="%(action_res_company_logo)d"
+                        string="Upload/Change Logo" type="action" icon="gtk-open"/>
+                    </page>
+                    </xpath>
+                </data>
+          </field>
+      </record>
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 1d5fa6ca4c7c547a8cf88ea6b52be28d63e85726 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 27 Apr 2011 19:05:18 +0530
Subject: [IMP]: *: Reviewed config wizards of all modules and changed type +
 state in order to follow the behaviour described below: * After a fresh
 installation of a DB if we dont select and application to install nothing
 will come * If I select HR module first time, this module will be installed
 and all special wizards of this module should be appeared * If I select HR
 module(its installed) again from application list, all special wizards of
 this module should be set as todo in order to display when clicking next *
 For any other wizards we have to go to list of config wizards and run them
 manually (for web client these are supposed to be there in config panel)

bzr revid: rpa@tinyerp.com-20110427133518-52mawayc3rgoyx9h
---
 addons/base_setup/base_setup_installer.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 65665af9a52..d5e9b94c8b6 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -112,6 +112,7 @@
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="type">normal</field>
+      <field name="state">skip</field>
   </record>
   
           <!-- Import or create customers configartion view  -->
@@ -160,7 +161,7 @@
     <!--          register configuration wizard -->
 	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="type">normal_recurring</field>
+	    <field name="type">normal</field>
 	    <field name="state">skip</field>
 	</record>
 	
@@ -214,6 +215,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="type">normal</field>
+          <field name="state">skip</field>
       </record>
       
       <!--     Config Wiz   Give access to others users   -->
-- 
cgit v1.2.3


From b2ace1f27e4b92e4da11c02d914651fe9de30de5 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 28 Apr 2011 17:26:51 +0530
Subject: [IMP]: base_setup: Imrovement in view of company to add new buttons

bzr revid: rpa@tinyerp.com-20110428115651-j2108mc6mdkv2cq4
---
 addons/base_setup/base_setup_installer.xml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index d5e9b94c8b6..3fb9eaeb287 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -242,27 +242,20 @@
       <!--      Inherit company Form -->
 
       <record id="view_inherit_res_company_logo" model="ir.ui.view">
-          <field name="name">Upload Logo11</field>
+          <field name="name">res.company.form.updated</field>
           <field name="model">res.company</field>
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//page[@string='General Information']" position="replace">
-                    <page string="General Information">
-	                    <group colspan="4">
-                            <field name="rml_header1" colspan="4"/>
-                            <field name="rml_footer1" colspan="4"/>
-                            <field name="rml_footer2" colspan="4"/>
-                            <field name="currency_id" colspan="2"/>
-	                     </group>
-	                     <separator string="" colspan="4"/>
-	                     <button name="createReport" string="Preview Reports" type="object" icon="gtk-print"/>
-	                     <button name="%(action_res_company_logo)d"
+                <field name="currency_id" position="after">
+                     <newline/>
+                     <separator string="" colspan="4"/>
+                     <group colspan="4" col="2">
+                     <button name="%(action_res_company_logo)d"
                         string="Upload/Change Logo" type="action" icon="gtk-open"/>
-                    </page>
-                    </xpath>
-                </data>
+                     <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
+                     </group>
+                </field>
           </field>
       </record>
        
-- 
cgit v1.2.3


From c67ce7f121e9f9ce5560599e7532886896c5cdde Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 3 May 2011 17:32:43 +0530
Subject: [IMP]Base_setup : Rename Give access to others users to Create New
 Users Login

bzr revid: aag@tinyerp.co.in-20110503120243-1rt5sfeza34v7z7h
---
 addons/base_setup/base_setup_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3fb9eaeb287..ff11696bbb4 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -218,10 +218,10 @@
           <field name="state">skip</field>
       </record>
       
-      <!--     Config Wiz   Give access to others users   -->
+      <!--     Config Wiz   Create New User's Login   -->
         
       <record id="action_config_access_other_user" model="ir.actions.act_window">
-          <field name="name">Give access to others users</field>
+          <field name="name">Create New User's Login</field>
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">res.users</field>
           <field name="view_type">form</field>
-- 
cgit v1.2.3


From b60cb67171470b59207ba8378038a12e21746562 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 4 May 2011 18:54:05 +0530
Subject: [IMP]Base_setup:Improve tooltip -Define default users preferences

bzr revid: aag@tinyerp.co.in-20110504132405-rxew8k7a3ncuf020
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ff11696bbb4..22408ddc966 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -182,7 +182,7 @@
             </xpath>
             <xpath expr="//label[@string='description']"
                position="attributes">
-              <attribute name="string">Specify default values. These data are just default values, each user is free to change his own preferences.</attribute>
+              <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>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
-- 
cgit v1.2.3


From 578668cd973a7993753e3a1632f961481176819d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 6 May 2011 14:10:25 +0530
Subject: [ADD]Base_setup:Add New Config Wiz - Upload Your Company Logo

bzr revid: aag@tinyerp.co.in-20110506084025-waa03u3s0hwabz4p
---
 addons/base_setup/base_setup_installer.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 22408ddc966..a41329d6081 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -258,6 +258,14 @@
                 </field>
           </field>
       </record>
+
+      <!--   register Upload Logo configuration wizard  -->
+
+      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
+          <field name="action_id" ref="action_res_company_logo"/>
+          <field name="type">normal</field>
+          <field name="state">cancel</field>
+      </record>      
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 824ef62fac56401ec0d95f0fe76291bcbc859f0a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 6 May 2011 16:00:31 +0530
Subject: [ADD]Base_setup:Import or create customers- showe List view of
 res.partner

bzr revid: aag@tinyerp.co.in-20110506103031-gjp3pkuav3ctbrut
---
 addons/base_setup/base_setup_installer.xml | 42 +++++-------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index a41329d6081..d5d26a8bebd 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -116,52 +116,22 @@
   </record>
   
           <!-- Import or create customers configartion view  -->
-
-	 <record id="view_import_create_installer" model="ir.ui.view">
-	     <field name="name">Import or create customers </field>
-	     <field name="model">product.installer</field>
-	     <field name="type">form</field>
-	     <field name="inherit_id" ref="base.res_config_view_base"/>
-	     <field name="arch" type="xml">
-	       <data>
-	         <form position="attributes">
-	           <attribute name="string">Import or create customers </attribute>
-	         </form>
-	         <separator string="title" position="attributes">
-	         <attribute name="string">Import or create customers </attribute>
-	           </separator>
-	         <xpath expr="//label[@string='description']"
-                 position="attributes">
-                <attribute name="string">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</attribute>
-              </xpath>
-	         <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	               <attribute name='rowspan'>15</attribute>
-	               <attribute name='string'></attribute>
-	          </xpath>
-	           
-	           <group string="res_config_contents" position="replace">
-	               <group colspan="4">
-	                   <field colspan="4" name="customers" width="200"/>
-	             </group>
-	         </group>
-	       </data>
-	     </field>
-	 </record>
 	
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
 	     <field name="name">Import or create customers </field>
 	     <field name="type">ir.actions.act_window</field>
-	     <field name="res_model">product.installer</field>
-	     <field name="view_id" ref="view_import_create_installer"/>
+	     <field name="res_model">res.partner</field>
 	     <field name="view_type">form</field>
-	     <field name="view_mode">form</field>
-	     <field name="target">new</field>
+	     <field name="view_mode">tree,form</field>
+	     <field name="view_id" ref="base.view_partner_tree"/>
+	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
 	 </record>
 
     <!--          register configuration wizard -->
-	<record id="config_wizard_res_product_installer" model="ir.actions.todo">
+	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
 	    <field name="type">normal</field>
+	    <field name="target">current</field>
 	    <field name="state">skip</field>
 	</record>
 	
-- 
cgit v1.2.3


From 363ebceea53caf18be2fc953b46205b77471a438 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 10 May 2011 10:14:56 +0530
Subject: [IMP]Base_setup:Remove Upload/Cange Logo btn

bzr revid: aag@tinyerp.co.in-20110510044456-ntn6t49zgftlbsds
---
 addons/base_setup/base_setup_installer.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index d5d26a8bebd..286aa817289 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -221,8 +221,6 @@
                      <newline/>
                      <separator string="" colspan="4"/>
                      <group colspan="4" col="2">
-                     <button name="%(action_res_company_logo)d"
-                        string="Upload/Change Logo" type="action" icon="gtk-open"/>
                      <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
                      </group>
                 </field>
-- 
cgit v1.2.3


From 8caa6c7dabb9c37b12fdb97f3177fe7cb26db6ab Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 13 May 2011 12:36:27 +0530
Subject: [IMP, REM]: Fixed view of company after changes in server, Removed
 unwanted view

bzr revid: rpa@tinyerp.com-20110513070627-funzvol19b85ahwi
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 286aa817289..b0e63f6962b 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,7 +217,7 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="currency_id" position="after">
+                <field name="rml_footer2" position="after">
                      <newline/>
                      <separator string="" colspan="4"/>
                      <group colspan="4" col="2">
-- 
cgit v1.2.3


From e32610654a91085a2952040ac5064ff336c34c0e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 18 May 2011 18:07:22 +0530
Subject: [IMP]Base_setup,Product: config wiz product Terminology move in Base
 setup & remove from Product

bzr revid: aag@tinyerp.co.in-20110518123722-s0k6xap9w8qwd0lo
---
 addons/base_setup/base_setup_installer.xml | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index b0e63f6962b..0956bef5f20 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -234,6 +234,56 @@
           <field name="type">normal</field>
           <field name="state">cancel</field>
       </record>      
+
+            <!--        Specify Your Terminology Config Wiz-->
+
+     <record id="view_partner_terminology_config_form" model="ir.ui.view">
+          <field name="name">Specify Your Terminology</field>
+          <field name="model">specify.partner.terminology</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.res_config_view_base"/>
+         <field name="arch" type="xml">
+            <data>
+              <form position="attributes">
+                <attribute name="string">Specify Your Terminology</attribute>
+              </form>
+            <xpath expr='//separator[@string="title"]' position='attributes'>
+                  <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>
+            </xpath>
+            <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                  <attribute name='string'></attribute>
+                 <attribute name='rowspan'>12</attribute>
+            </xpath>
+             <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" name="partner" />
+                  </group>
+              </group>
+            </data>
+          </field>
+      </record>
+
+      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+          <field name="name">Specify Your Terminology</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">specify.partner.terminology</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="view_partner_terminology_config_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+
+      <!--   Register configuration wizard -->
+     
+      <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
+          <field name="action_id" ref="action_partner_terminology_config_form"/>
+          <field name="type">normal</field>
+          <field name="state">skip</field>
+      </record>      
        
   </data>
 </openerp>
-- 
cgit v1.2.3


From 04e94e31a07cb4787777573eda9937492e8de9e6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 16:48:57 +0530
Subject: [IMP]base_setup,point_of_sale: button preview reports is smaller and
 on top right of tab header/footer and Tab Other  merged with  Tab
 configuration

bzr revid: aag@tinyerp.co.in-20110527111857-1npksiluu66vabfm
---
 addons/base_setup/base_setup_installer.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 0956bef5f20..591d3b891b5 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,12 +217,12 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                     <newline/>
-                     <separator string="" colspan="4"/>
-                     <group colspan="4" col="2">
-                     <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                     </group>
+                <field name="rml_header" position="before">
+                    <group colspan="4" col="8">
+                        <label string="" colspan="7"/>
+                        <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
+                        <separator string="" colspan="8"/>
+                    </group>
                 </field>
           </field>
       </record>
-- 
cgit v1.2.3


From 6fa71aab39c7af95d2b516f679243cd9619f3107 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 17:33:13 +0530
Subject: [IMP]base_setup: button preview reports move at the right of group of
 header/footer of report

bzr revid: aag@tinyerp.co.in-20110527120313-62jjchhe6mapt9ln
---
 addons/base_setup/base_setup_installer.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 591d3b891b5..aa4fe1b9532 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -217,11 +217,10 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="base.view_company_form" />
           <field name="arch" type="xml">
-                <field name="rml_header" position="before">
+                <field name="rml_header1" position="before">
                     <group colspan="4" col="8">
                         <label string="" colspan="7"/>
                         <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                        <separator string="" colspan="8"/>
                     </group>
                 </field>
           </field>
-- 
cgit v1.2.3


From a02fd9e3883d2dcfd330aa694004d5c2f204f479 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 31 May 2011 18:37:35 +0530
Subject: [ADD]Base_setup : Install Applications - add to Install Application

bzr revid: aag@tinyerp.co.in-20110531130735-nrzr26b0sq1hu8il
---
 addons/base_setup/base_setup_installer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 00a48eaf06b..415d2f33d4c 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -58,9 +58,15 @@
       <field name="view_mode">form</field>
       <field name="target">new</field>
     </record>
+    
+    <record id="category_base_setup_installer" model="ir.actions.todo.category">
+      <field name="name">Install</field>
+      <field name="sequence">1</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="category_base_setup_installer"/>
         <field name="sequence">2</field>
         <field name="type">normal_recurring</field>
     </record>
-- 
cgit v1.2.3


From cd6e46abed5d17092a721b65b34336de885c8d49 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 31 May 2011 18:44:19 +0530
Subject: [ADD]Base_setup : Configure Your Interface - add to Install- 2 seq
 Application

bzr revid: aag@tinyerp.co.in-20110531131419-axbw7eu9y8rfebw6
---
 addons/base_setup/base_setup_installer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 415d2f33d4c..24ac3632a3f 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -114,9 +114,15 @@
 	     <field name="view_mode">form</field>
 	     <field name="target">new</field>
    </record>
+   
+    <record id="category_migrade_application_installer_modules" model="ir.actions.todo.category">
+      <field name="name">Install</field>
+      <field name="sequence">2</field>
+    </record> 
  
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
+      <field name="category_id" ref="category_migrade_application_installer_modules"/>
       <field name="type">normal</field>
       <field name="state">skip</field>
   </record>
-- 
cgit v1.2.3


From c6911247e7315df3c7170ba848978dfc66eb0f59 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 31 May 2011 18:51:31 +0530
Subject: [ADD]Base_setup : Import or create customers - add to sale -1 seq
 Application

bzr revid: aag@tinyerp.co.in-20110531132131-uy2bzlsb0bzwprzi
---
 addons/base_setup/base_setup_installer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 24ac3632a3f..f1133b447ce 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -138,10 +138,17 @@
 	     <field name="view_id" ref="base.view_partner_tree"/>
 	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
 	 </record>
+	 
+     <record id="category_import_create_installer" model="ir.actions.todo.category">
+      <field name="name">Sale</field>
+      <field name="sequence">1</field>
+     </record>    
+	 
 
     <!--          register configuration wizard -->
 	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
+	    <field name="category_id" ref="category_import_create_installer"/>
 	    <field name="type">normal</field>
 	    <field name="target">current</field>
 	    <field name="state">skip</field>
-- 
cgit v1.2.3


From 1c26d1898398bccc01277c6fd6cbc3ff1c4ecf53 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 11:49:24 +0530
Subject: [ADD]Base_setup : Define default users preferences- add to Admin - 4
 seq  category

bzr revid: aag@tinyerp.co.in-20110601061924-7kmv92v48v97qf6a
---
 addons/base_setup/base_setup_installer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index f1133b447ce..564146e4fe1 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -198,11 +198,18 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
+      
+    <record id="category_user_preferences_config_form" model="ir.actions.todo.category">
+      <field name="name">Admin</field>
+      <field name="sequence">4</field>
+    </record>    
+      
 
       <!--   Register configuration wizard -->
       
       <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="category_user_preferences_config_form"/>
           <field name="type">normal</field>
           <field name="state">skip</field>
       </record>
-- 
cgit v1.2.3


From 8fd16e428a3b0eb9f88e3c671b3d7e203f0fa5ad Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 11:55:07 +0530
Subject: [ADD]Base_setup : Create New Users Login- add to Admin - 1 seq 
 category

bzr revid: aag@tinyerp.co.in-20110601062507-kwxu6377oeia8b9y
---
 addons/base_setup/base_setup_installer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 564146e4fe1..31041928e09 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -224,11 +224,17 @@
           <field name="view_mode">form</field>
           <field name="view_id" ref="base.view_users_form"/>
       </record>
+
+    <record id="category_config_access_other_user" model="ir.actions.todo.category">
+      <field name="name">Admin</field>
+      <field name="sequence">1</field>
+    </record>    
       
       <!--   register configuration wizard  -->
 
       <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="category_config_access_other_user"/>
           <field name="type">normal</field>
           <field name="target">current</field>
           <field name="sequence">1000</field>
-- 
cgit v1.2.3


From 7f91440cad47549c5df39c21336536de2ec71c69 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 12:14:23 +0530
Subject: [ADD]Base_setup:In Upload Your Company Logo  add add to Admin - 5 seq
  category

bzr revid: aag@tinyerp.co.in-20110601064423-nxngfxiaj7w1uvn2
---
 addons/base_setup/base_setup_installer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 31041928e09..4d61ac20658 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -257,11 +257,17 @@
                 </field>
           </field>
       </record>
+      
+      <record id="category_res_company_logo" model="ir.actions.todo.category">
+        <field name="name">Admin</field>
+        <field name="sequence">5</field>
+      </record>         
 
       <!--   register Upload Logo configuration wizard  -->
 
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
           <field name="action_id" ref="action_res_company_logo"/>
+          <field name="category_id" ref="category_res_company_logo"/>
           <field name="type">normal</field>
           <field name="state">cancel</field>
       </record>      
-- 
cgit v1.2.3


From 671911fd71ed69019ed96a9d8351ee53f2ff9e18 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 12:21:52 +0530
Subject: [ADD]Base_setup:Specify Your Terminology  add to Admin - 6 seq 
 category

bzr revid: aag@tinyerp.co.in-20110601065152-xzlbf9jim32aaooo
---
 addons/base_setup/base_setup_installer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 4d61ac20658..42fa8ca1bfd 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -313,11 +313,17 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
+      
+      <record id="category_partner_terminology_config_form" model="ir.actions.todo.category">
+          <field name="name">Admin</field>
+          <field name="sequence">6</field>
+      </record>         
 
       <!--   Register configuration wizard -->
      
       <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="category_partner_terminology_config_form"/>
           <field name="type">normal</field>
           <field name="state">skip</field>
       </record>      
-- 
cgit v1.2.3


From 2bc022089d620fdfb73af3f5ac0e57a03d5ca7d0 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:01:25 +0530
Subject: [IMP]base_setup:Install Applications in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603063125-7m048w5n6i0u3rwk
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 42fa8ca1bfd..1eb724a3364 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -60,7 +60,7 @@
     </record>
     
     <record id="category_base_setup_installer" model="ir.actions.todo.category">
-      <field name="name">Install</field>
+      <field name="name">Administration</field>
       <field name="sequence">1</field>
     </record>     
 
-- 
cgit v1.2.3


From 3ea0dce0ce95c057c03ed2aa86ff9d825fe4bb5c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:04:49 +0530
Subject: [IMP]base_setup:Create New Users Login-1 categ

bzr revid: aag@tinyerp.co.in-20110603063449-ccknnje9wgq87jh1
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 1eb724a3364..961a0b2cc99 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -226,7 +226,7 @@
       </record>
 
     <record id="category_config_access_other_user" model="ir.actions.todo.category">
-      <field name="name">Admin</field>
+      <field name="name">Administration</field>
       <field name="sequence">1</field>
     </record>    
       
-- 
cgit v1.2.3


From 2e417d610668d901b4cd336ee281a608fc65ca36 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:15:50 +0530
Subject: [IMP]base_setup:Define default users preferences in Administration-1
 categ

bzr revid: aag@tinyerp.co.in-20110603064550-vur5ycubakpv4uj2
---
 addons/base_setup/base_setup_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 961a0b2cc99..af49f9d978e 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -200,8 +200,8 @@
       </record>
       
     <record id="category_user_preferences_config_form" model="ir.actions.todo.category">
-      <field name="name">Admin</field>
-      <field name="sequence">4</field>
+      <field name="name">Administration</field>
+      <field name="sequence">1</field>
     </record>    
       
 
-- 
cgit v1.2.3


From b4eb12468377fc164e110232392dc4f289a8a94a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:33:47 +0530
Subject: [IMP]base_setup:Install Applications in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603070347-abqnre7fdmm6v4an
---
 addons/base_setup/base_setup_installer.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index af49f9d978e..44772edd46c 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -58,15 +58,10 @@
       <field name="view_mode">form</field>
       <field name="target">new</field>
     </record>
-    
-    <record id="category_base_setup_installer" model="ir.actions.todo.category">
-      <field name="name">Administration</field>
-      <field name="sequence">1</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="category_base_setup_installer"/>
+        <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
         <field name="type">normal_recurring</field>
     </record>
-- 
cgit v1.2.3


From 0a437a7b80e24ff89e0c7212725f417417aaa163 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:38:30 +0530
Subject: [IMP]base_setup:Create New Users Login-1 categ

bzr revid: aag@tinyerp.co.in-20110603070830-rx1hq2ert8tsam80
---
 addons/base_setup/base_setup_installer.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 44772edd46c..8dc65018095 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -219,17 +219,12 @@
           <field name="view_mode">form</field>
           <field name="view_id" ref="base.view_users_form"/>
       </record>
-
-    <record id="category_config_access_other_user" model="ir.actions.todo.category">
-      <field name="name">Administration</field>
-      <field name="sequence">1</field>
-    </record>    
       
       <!--   register configuration wizard  -->
 
       <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="category_config_access_other_user"/>
+          <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
           <field name="target">current</field>
           <field name="sequence">1000</field>
-- 
cgit v1.2.3


From 6b417e42446e52e84c8b257086f89fdffd80fd72 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:45:08 +0530
Subject: [IMP]base_setup:Upload Your Company Logo   in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603071508-lqopms2jlg55ei0c
---
 addons/base_setup/base_setup_installer.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 8dc65018095..84f82857812 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -193,18 +193,12 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
-      
-    <record id="category_user_preferences_config_form" model="ir.actions.todo.category">
-      <field name="name">Administration</field>
-      <field name="sequence">1</field>
-    </record>    
-      
 
       <!--   Register configuration wizard -->
       
       <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="category_user_preferences_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
           <field name="state">skip</field>
       </record>
@@ -248,16 +242,11 @@
           </field>
       </record>
       
-      <record id="category_res_company_logo" model="ir.actions.todo.category">
-        <field name="name">Admin</field>
-        <field name="sequence">5</field>
-      </record>         
-
       <!--   register Upload Logo configuration wizard  -->
 
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
           <field name="action_id" ref="action_res_company_logo"/>
-          <field name="category_id" ref="category_res_company_logo"/>
+          <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
           <field name="state">cancel</field>
       </record>      
-- 
cgit v1.2.3


From 8d56268bf7a496c19c05f20f2d0ae456a3b67f37 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:47:43 +0530
Subject: [IMP]base_setup:Specify Your Terminology in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603071743-votgffj5hveemchw
---
 addons/base_setup/base_setup_installer.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 84f82857812..9fe7c59f2e7 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -292,17 +292,12 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
-      
-      <record id="category_partner_terminology_config_form" model="ir.actions.todo.category">
-          <field name="name">Admin</field>
-          <field name="sequence">6</field>
-      </record>         
 
       <!--   Register configuration wizard -->
      
       <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="category_partner_terminology_config_form"/>
+          <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
           <field name="state">skip</field>
       </record>      
-- 
cgit v1.2.3


From f77e62d04bfca3073b9265e4b69b34726b7cebff Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:50:43 +0530
Subject: [IMP]base_setup:Migrate data from another application in
 Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603072043-gfphazj7jvb6p9zt
---
 addons/base_setup/base_setup_installer.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 9fe7c59f2e7..2edb2c22cc7 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -109,15 +109,10 @@
 	     <field name="view_mode">form</field>
 	     <field name="target">new</field>
    </record>
-   
-    <record id="category_migrade_application_installer_modules" model="ir.actions.todo.category">
-      <field name="name">Install</field>
-      <field name="sequence">2</field>
-    </record> 
  
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="category_id" ref="category_migrade_application_installer_modules"/>
+      <field name="category_id" ref="base.category_administration_config"/>
       <field name="type">normal</field>
       <field name="state">skip</field>
   </record>
-- 
cgit v1.2.3


From 30a2b75ed5000042a5d02f49a5388c3e262892a4 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:56:12 +0530
Subject: [IMP]base_setup:Import or create customers in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603072612-dh0af2l2h1m160n3
---
 addons/base_setup/base_setup_installer.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 2edb2c22cc7..e202ce3026a 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -128,17 +128,11 @@
 	     <field name="view_id" ref="base.view_partner_tree"/>
 	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
 	 </record>
-	 
-     <record id="category_import_create_installer" model="ir.actions.todo.category">
-      <field name="name">Sale</field>
-      <field name="sequence">1</field>
-     </record>    
-	 
 
     <!--          register configuration wizard -->
 	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="category_id" ref="category_import_create_installer"/>
+	    <field name="category_id" ref="base.category_administration_config"/>
 	    <field name="type">normal</field>
 	    <field name="target">current</field>
 	    <field name="state">skip</field>
-- 
cgit v1.2.3


From 760b5f1e7acbc756ec7424903a617a6a06fece7a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 8 Jun 2011 19:51:49 +0530
Subject: [IMP]Allmodule:set sequnce for merging wizards

bzr revid: aag@tinyerp.co.in-20110608142149-6opzcib2in0dxumx
---
 addons/base_setup/base_setup_installer.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e202ce3026a..86ca48d9fcf 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -44,6 +44,36 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <group  name="crm">
+            </group>
+            <group  name="sale">
+            </group>
+            <group  name="project">
+            </group>
+            <group  name="knowledge">
+            </group>
+            <group  name="stock">
+            </group>
+            <group  name="mrp">
+            </group>
+            <group  name="account_voucher">
+            </group>
+            <group  name="account_accountant">
+            </group>
+            <group  name="purchase">
+            </group>
+            <group  name="hr">
+            </group>
+            <group  name="profile_tools">
+            </group>
+            <group  name="marketing">
+            </group>
+            <group  name="point_of_sale">
+            </group>
+            <group  name="report_designer">
+            </group>
+            <group  name="association">
+            </group>
           </group>
         </data>
       </field>
-- 
cgit v1.2.3


From 58db2bfa443ec4e8e0d7d2a66d55c6be5dccff6d Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 9 Jun 2011 12:51:33 +0530
Subject: [IMP]Base_setup:Optimize code

bzr revid: aag@tinyerp.co.in-20110609072133-d8dorhnww8hfc38q
---
 addons/base_setup/base_setup_installer.xml | 42 +++++++++---------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 86ca48d9fcf..3f622d2b153 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -44,36 +44,18 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <group  name="crm">
-            </group>
-            <group  name="sale">
-            </group>
-            <group  name="project">
-            </group>
-            <group  name="knowledge">
-            </group>
-            <group  name="stock">
-            </group>
-            <group  name="mrp">
-            </group>
-            <group  name="account_voucher">
-            </group>
-            <group  name="account_accountant">
-            </group>
-            <group  name="purchase">
-            </group>
-            <group  name="hr">
-            </group>
-            <group  name="profile_tools">
-            </group>
-            <group  name="marketing">
-            </group>
-            <group  name="point_of_sale">
-            </group>
-            <group  name="report_designer">
-            </group>
-            <group  name="association">
-            </group>
+            <group  name="crm"> </group>
+            <group  name="sale"> </group>
+            <group  name="project"> </group>
+            <group  name="knowledge"> </group>
+            <group  name="mrp"> </group>
+            <group  name="account_accountant"> </group>
+            <group  name="purchase"> </group>
+            <group  name="hr"> </group>
+            <group  name="profile_tools"> </group>
+            <group  name="marketing"> </group>
+            <group  name="report_designer"> </group>            
+            <group  name="association"> </group>
           </group>
         </data>
       </field>
-- 
cgit v1.2.3


From 3f8b83194dccb71a86b0072b3cc6382f674f8569 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 9 Jun 2011 15:45:00 +0530
Subject: [IMP]Base_setup:Optimize code

bzr revid: aag@tinyerp.co.in-20110609101500-0efw23mwx7rmmobh
---
 addons/base_setup/base_setup_installer.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3f622d2b153..997f6ce57a1 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -44,18 +44,18 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <group  name="crm"> </group>
-            <group  name="sale"> </group>
-            <group  name="project"> </group>
-            <group  name="knowledge"> </group>
-            <group  name="mrp"> </group>
-            <group  name="account_accountant"> </group>
-            <group  name="purchase"> </group>
-            <group  name="hr"> </group>
-            <group  name="profile_tools"> </group>
-            <group  name="marketing"> </group>
-            <group  name="report_designer"> </group>            
-            <group  name="association"> </group>
+            <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>
         </data>
       </field>
-- 
cgit v1.2.3


From 1ebbc3f6dadb92272a7f3cb9e0dfa9fbb9b3bba6 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 9 Jun 2011 16:16:06 +0530
Subject: [IMP]Base_setup:Optimize code

bzr revid: aag@tinyerp.co.in-20110609104606-bwp6c8mrhl1nxzwy
---
 addons/base_setup/base_setup_installer.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 997f6ce57a1..ba1b1ad665c 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -44,18 +44,18 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,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"/> 
+            <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>
         </data>
       </field>
-- 
cgit v1.2.3


From b49306e4458c850d7f13315800f1e98bc167a285 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 23 Jun 2011 17:44:03 +0530
Subject: [IMP] Base_setup:change help-menutip of Define default users
 preferences wizards- set values for all existing user and default values for
 each new user

bzr revid: aag@tinyerp.co.in-20110623121403-fsh42481dkcegvpq
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ba1b1ad665c..fd72251eaa4 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -167,7 +167,7 @@
             </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">Specify default values.This will set values for each existing users and set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
-- 
cgit v1.2.3


From ba239a8eb0e6615cb34698da2413543add1e8f00 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 24 Jun 2011 18:44:38 +0530
Subject: [REVERT]: base_setup: Reverted tooltip of user preferences

bzr revid: rpa@tinyerp.com-20110624131438-wij58633pfxvllyt
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index fd72251eaa4..ba1b1ad665c 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -167,7 +167,7 @@
             </xpath>
             <xpath expr="//label[@string='description']"
                position="attributes">
-              <attribute name="string">Specify default values.This will set values for each existing users and set the default values for each new user, each user is free to change his own preferences.</attribute>
+              <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>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
-- 
cgit v1.2.3


From befe614417a51120bfa8f7385840d3f9afba29d5 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 24 Jun 2011 18:46:16 +0530
Subject: [IMP]: base_setup: Minor typo in helptext

bzr revid: rpa@tinyerp.com-20110624131616-yojpxfdnbuqqtdl7
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ba1b1ad665c..decda4ee6aa 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -167,7 +167,7 @@
             </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">Specify default values. This will set the default values for each new user, each user is free to change his own preferences.</attribute>
             </xpath>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
-- 
cgit v1.2.3


From 111aaad609ade44cac0ee5a0dbd426b825678d7a Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 27 Jun 2011 11:43:40 +0530
Subject: [REM]: base_setup: Removed unused code, cleaned code

bzr revid: rpa@tinyerp.com-20110627061340-yk7f5shyzj1qvcrj
---
 addons/base_setup/base_setup_installer.xml | 75 +++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 28 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ba1b1ad665c..96ccb8aedcd 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -1,6 +1,6 @@
 <openerp>
   <data>
-  
+
     <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>
@@ -24,7 +24,7 @@
           <separator string="title" position="attributes">
             <attribute name="string">Install Applications</attribute>
           </separator>
-            
+
           <group colspan="8">
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
@@ -44,18 +44,18 @@
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <group name="crm"/> 
-            <group name="sale"/> 
-            <group name="project"/> 
-            <group name="knowledge"/> 
-            <group name="mrp"/> 
+            <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="hr"/>
+            <group name="profile_tools"/>
+            <group name="marketing"/>
+            <group name="report_designer"/>
+            <group name="association"/>
           </group>
         </data>
       </field>
@@ -77,7 +77,7 @@
         <field name="sequence">2</field>
         <field name="type">normal_recurring</field>
     </record>
-    
+
 <!--     Migrate data from another application Conf Wiz-->
 
     <record id="view_migrade_application_installer_modules" model="ir.ui.view">
@@ -111,7 +111,7 @@
             </data>
         </field>
     </record>
-    
+
     <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
 	     <field name="name">Migrate data from another application</field>
 	     <field name="type">ir.actions.act_window</field>
@@ -121,16 +121,16 @@
 	     <field name="view_mode">form</field>
 	     <field name="target">new</field>
    </record>
- 
+
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="category_id" ref="base.category_administration_config"/>
       <field name="type">normal</field>
       <field name="state">skip</field>
   </record>
-  
+
           <!-- Import or create customers configartion view  -->
-	
+
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
 	     <field name="name">Import or create customers </field>
 	     <field name="type">ir.actions.act_window</field>
@@ -149,7 +149,7 @@
 	    <field name="target">current</field>
 	    <field name="state">skip</field>
 	</record>
-	
+
 	<!--        Define default users preferences-->
 
      <record id="view_user_preferences_config_form" model="ir.ui.view">
@@ -196,16 +196,16 @@
       </record>
 
       <!--   Register configuration wizard -->
-      
+
       <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">normal</field>
           <field name="state">skip</field>
       </record>
-      
+
       <!--     Config Wiz   Create New User's Login   -->
-        
+
       <record id="action_config_access_other_user" model="ir.actions.act_window">
           <field name="name">Create New User's Login</field>
           <field name="type">ir.actions.act_window</field>
@@ -214,7 +214,7 @@
           <field name="view_mode">form</field>
           <field name="view_id" ref="base.view_users_form"/>
       </record>
-      
+
       <!--   register configuration wizard  -->
 
       <record id="config_wizard_action_config_user_form" model="ir.actions.todo">
@@ -225,7 +225,7 @@
           <field name="sequence">1000</field>
           <field name="state">cancel</field>
       </record>
-      
+
       <!--      Inherit company Form -->
 
       <record id="view_inherit_res_company_logo" model="ir.ui.view">
@@ -242,7 +242,7 @@
                 </field>
           </field>
       </record>
-      
+
       <!--   register Upload Logo configuration wizard  -->
 
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
@@ -250,7 +250,7 @@
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
           <field name="state">cancel</field>
-      </record>      
+      </record>
 
             <!--        Specify Your Terminology Config Wiz-->
 
@@ -295,13 +295,32 @@
       </record>
 
       <!--   Register configuration wizard -->
-     
+
       <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">normal</field>
           <field name="state">skip</field>
-      </record>      
-       
+      </record>
+
+
+    <record id="action_base_setup_company" model="ir.actions.act_window">
+      <field name="name">Company Configuration</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': 1}</field>
+    </record>
+
+    <record id="base_setup_company_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_company"/>
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="sequence">1</field>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
+    </record>
+
   </data>
 </openerp>
-- 
cgit v1.2.3


From 216bc993ad3a5744852498972f0bedcc29372cd3 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 28 Jun 2011 17:31:11 +0530
Subject: [IMP]: base_setup: Instead of putting static id to open company put
 res.company_id.id (improved code in launch to eval user)

bzr revid: rpa@tinyerp.com-20110628120111-rg56qruod14kgfgt
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 96ccb8aedcd..1e01cd3ed51 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -311,7 +311,7 @@
       <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': 1}</field>
+      <field name="context">{'res_id': user.company_id.id}</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
cgit v1.2.3


From 9813f8e57dc037dbd410e7e3ef087690094009cc Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 28 Jun 2011 17:40:42 +0530
Subject: [IMP]: base_setup: We should be able to choose association, food,
 auction at the same time instead of only one at one time

bzr revid: rpa@tinyerp.com-20110628121042-vmcxiye6x80yf2yq
---
 addons/base_setup/base_setup_installer.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ba1b1ad665c..e208bea28ad 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -41,9 +41,9 @@
             <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <group name="crm"/> 
             <group name="sale"/> 
             <group name="project"/> 
-- 
cgit v1.2.3


From 2b4cebe71edb7fbbfab3988fa91eb46f0b2bd36a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 5 Jul 2011 09:51:46 +0530
Subject: [REM] Base_setup : Preview Report button Remove From Addons side

bzr revid: aag@tinyerp.co.in-20110705042146-d0paj1jt1ts806mf
---
 addons/base_setup/base_setup_installer.xml | 17 -----------------
 1 file changed, 17 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index daae87b5eb0..e8168a69ea9 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -226,23 +226,6 @@
           <field name="state">cancel</field>
       </record>
 
-      <!--      Inherit company Form -->
-
-      <record id="view_inherit_res_company_logo" model="ir.ui.view">
-          <field name="name">res.company.form.updated</field>
-          <field name="model">res.company</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.view_company_form" />
-          <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                    <group colspan="4" col="8">
-                        <label string="" colspan="7"/>
-                        <button name="preview_report" string="Preview Report" type="object" icon="gtk-print"/>
-                    </group>
-                </field>
-          </field>
-      </record>
-
       <!--   register Upload Logo configuration wizard  -->
 
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
-- 
cgit v1.2.3


From a5fdb75ad6a54db8dc3d5d68d8551cc093f7be0e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 14 Jul 2011 12:37:25 +0200
Subject: [FIX] ir.actions.todo are now unskippable

bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
---
 addons/base_setup/base_setup_installer.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e8168a69ea9..50ea6fd149e 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -75,7 +75,7 @@
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
-        <field name="type">normal_recurring</field>
+        <field name="type">recurring</field>
     </record>
 
 <!--     Migrate data from another application Conf Wiz-->
@@ -126,7 +126,6 @@
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="category_id" ref="base.category_administration_config"/>
       <field name="type">normal</field>
-      <field name="state">skip</field>
   </record>
 
           <!-- Import or create customers configartion view  -->
@@ -147,7 +146,6 @@
 	    <field name="category_id" ref="base.category_administration_config"/>
 	    <field name="type">normal</field>
 	    <field name="target">current</field>
-	    <field name="state">skip</field>
 	</record>
 
 	<!--        Define default users preferences-->
@@ -201,7 +199,6 @@
           <field name="action_id" ref="action_user_preferences_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
-          <field name="state">skip</field>
       </record>
 
       <!--     Config Wiz   Create New User's Login   -->
@@ -283,7 +280,6 @@
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
-          <field name="state">skip</field>
       </record>
 
 
@@ -302,7 +298,6 @@
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
         <field name="type">normal</field>
-        <field name="state">skip</field>
     </record>
 
   </data>
-- 
cgit v1.2.3


From 02e25761c561f178e58d686306d839303f796ac5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 18 Jul 2011 11:40:03 +0200
Subject: [FIX] rename state 'cancel' to 'hidden'in ir.actions.todo objects

bzr revid: xmo@openerp.com-20110718094003-oonuapw8ul6tw4ax
---
 addons/base_setup/base_setup_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 50ea6fd149e..c51acb79127 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -220,7 +220,7 @@
           <field name="type">normal</field>
           <field name="target">current</field>
           <field name="sequence">1000</field>
-          <field name="state">cancel</field>
+          <field name="state">hidden</field>
       </record>
 
       <!--   register Upload Logo configuration wizard  -->
@@ -229,7 +229,7 @@
           <field name="action_id" ref="action_res_company_logo"/>
           <field name="category_id" ref="base.category_administration_config"/>
           <field name="type">normal</field>
-          <field name="state">cancel</field>
+          <field name="state">hidden</field>
       </record>
 
             <!--        Specify Your Terminology Config Wiz-->
-- 
cgit v1.2.3


From 5e05bcca22aa6ddfa810fdbdf8fe6944e1d11331 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 18 Jul 2011 16:02:02 +0200
Subject: [ADD] 'Add More Features' item

bzr revid: xmo@openerp.com-20110718140202-8kerjryzu39blj1k
---
 addons/base_setup/base_setup_installer.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index c51acb79127..586de522a07 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -78,6 +78,25 @@
         <field name="type">recurring</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 = obj.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" />
+    <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>
 <!--     Migrate data from another application Conf Wiz-->
 
     <record id="view_migrade_application_installer_modules" model="ir.ui.view">
-- 
cgit v1.2.3


From 1addfdc3258e21b42d76f7207974eee54ad19dc7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 28 Jul 2011 17:45:48 +0530
Subject: [IMP]base_setup: Improvement is done

bzr revid: mma@tinyerp.com-20110728121548-lfbq6gx7m7bkqx0h
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e8168a69ea9..f418a47ad93 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -268,7 +268,7 @@
       </record>
 
       <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Specify Your Terminology</field>
+          <field name="name">Customer / Partner / Patient ?</field>
           <field name="type">ir.actions.act_window</field>
           <field name="res_model">specify.partner.terminology</field>
           <field name="view_type">form</field>
-- 
cgit v1.2.3


From 3dc62dcb6f86c9e3ddfb503df53d72bd479e6704 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 29 Jul 2011 16:18:00 +0530
Subject: [IMP]base_setup:Improvement is done in the proper branch

bzr revid: mma@tinyerp.com-20110729104800-8cy1r1u7c5vjviam
---
 addons/base_setup/base_setup_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index f418a47ad93..722f7a6de45 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -132,13 +132,13 @@
           <!-- Import or create customers configartion view  -->
 
 	 <record id="action_import_create_installer" model="ir.actions.act_window">
-	     <field name="name">Import or create customers </field>
+	     <field name="name">Import or Create Customers</field>
 	     <field name="type">ir.actions.act_window</field>
 	     <field name="res_model">res.partner</field>
 	     <field name="view_type">form</field>
 	     <field name="view_mode">tree,form</field>
 	     <field name="view_id" ref="base.view_partner_tree"/>
-	     <field name="help">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</field>
+	     <field name="help">Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
 	 </record>
 
     <!--          register configuration wizard -->
-- 
cgit v1.2.3


From cc13113641442cd34ea5587ad109477efe8b1f0d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Jul 2011 15:48:10 +0200
Subject: [REF] reformat xml files before applying automated search&replace on
 them

bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
---
 addons/base_setup/base_setup_installer.xml | 57 +++++++++++++-----------------
 1 file changed, 25 insertions(+), 32 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 586de522a07..051bcf0c594 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -14,9 +14,9 @@
           <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="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                    <attribute name='rowspan'>15</attribute>
+          <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>
@@ -82,15 +82,10 @@
       <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 = obj.pool.get(\'ir.actions.todo\').action_launch(cr, uid, ' + str([ref('base_setup_installer_todo')]) + ', context=context)'"/>
+      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.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>
@@ -118,8 +113,8 @@
                 <xpath expr="//button[@string='Install Modules']" position="attributes">
                     <attribute name="string">Configure</attribute>
                 </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="string"/>
                 </xpath>
                 <group colspan="8">
                     <field name="import_saleforce"/>
@@ -179,23 +174,22 @@
               <form position="attributes">
                 <attribute name="string">Define default users preferences</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Define default users preferences</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Define default users preferences</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <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>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                  <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                  <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="view" />
-                        <field colspan="4" name="context_lang" />
-                        <field colspan="4" name="context_tz" />
-                        <field colspan="4" name="menu_tips" />
+                        <field colspan="4" name="view"/>
+                        <field colspan="4" name="context_lang"/>
+                        <field colspan="4" name="context_tz"/>
+                        <field colspan="4" name="menu_tips"/>
                   </group>
               </group>
             </data>
@@ -263,20 +257,19 @@
               <form position="attributes">
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
-            <xpath expr='//separator[@string="title"]' position='attributes'>
-                  <attribute name='string'>Specify Your Terminology</attribute>
+            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
+                  <attribute name="string">Specify Your Terminology</attribute>
             </xpath>
-            <xpath expr="//label[@string='description']"
-               position="attributes">
+            <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>
             </xpath>
-            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                  <attribute name='string'></attribute>
-                 <attribute name='rowspan'>12</attribute>
+            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                  <attribute name="string"/>
+                 <attribute name="rowspan">12</attribute>
             </xpath>
              <group string="res_config_contents" position="replace">
                     <group colspan="4">
-                        <field colspan="4" name="partner" />
+                        <field colspan="4" name="partner"/>
                   </group>
               </group>
             </data>
@@ -320,4 +313,4 @@
     </record>
 
   </data>
-</openerp>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 09cf4d40d0e8e558b8847bcb8853eac37a738285 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Jul 2011 16:03:24 +0200
Subject: [FIX] convert ir.actions.todo fields to match model definition
 changes

* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
---
 addons/base_setup/base_setup_installer.xml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 051bcf0c594..c7a584bb743 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -75,7 +75,6 @@
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">2</field>
-        <field name="type">recurring</field>
     </record>
 
     <record id="action_start_configurator" model="ir.actions.server">
@@ -139,7 +138,6 @@
    <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_migrade_application_installer_modules"/>
       <field name="category_id" ref="base.category_administration_config"/>
-      <field name="type">normal</field>
   </record>
 
           <!-- Import or create customers configartion view  -->
@@ -158,9 +156,7 @@
 	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
 	    <field name="action_id" ref="action_import_create_installer"/>
 	    <field name="category_id" ref="base.category_administration_config"/>
-	    <field name="type">normal</field>
-	    <field name="target">current</field>
-	</record>
+    </record>
 
 	<!--        Define default users preferences-->
 
@@ -211,7 +207,6 @@
       <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">normal</field>
       </record>
 
       <!--     Config Wiz   Create New User's Login   -->
@@ -230,10 +225,8 @@
       <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="type">normal</field>
-          <field name="target">current</field>
           <field name="sequence">1000</field>
-          <field name="state">hidden</field>
+          <field name="state">done</field>
       </record>
 
       <!--   register Upload Logo configuration wizard  -->
@@ -241,8 +234,7 @@
       <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
           <field name="action_id" ref="action_res_company_logo"/>
           <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">normal</field>
-          <field name="state">hidden</field>
+          <field name="state">done</field>
       </record>
 
             <!--        Specify Your Terminology Config Wiz-->
@@ -291,7 +283,6 @@
       <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">normal</field>
       </record>
 
 
@@ -309,8 +300,7 @@
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
-        <field name="type">normal</field>
     </record>
 
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
-- 
cgit v1.2.3


From 88a2b980f8ab39b96d37c832ac076d759c538102 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 19 Aug 2011 03:13:12 +0200
Subject: [IMP] base_setup cleanups

bzr revid: al@openerp.com-20110819011312-ekjioj2f1bloom3i
---
 addons/base_setup/base_setup_installer.xml | 306 -----------------------------
 1 file changed, 306 deletions(-)
 delete mode 100644 addons/base_setup/base_setup_installer.xml

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

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
deleted file mode 100644
index 91963737e12..00000000000
--- a/addons/base_setup/base_setup_installer.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<openerp>
-  <data>
-
-    <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" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <separator string="Install Specific Industry Applications" colspan="4"/>
-            <field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,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>
-        </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"/>
-      <field name="state">code</field>
-      <field name="code" eval="'# obj is a browse_record and will provide stupid ids to method\n' 'action = obj.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"/>
-    <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>
-<!--     Migrate data from another application Conf Wiz-->
-
-    <record id="view_migrade_application_installer_modules" model="ir.ui.view">
-        <field name="name">migrade.application.installer.modules.form</field>
-        <field name="model">migrade.application.installer.modules</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">Migrate data from another application</attribute>
-                </form>
-                <separator string="title" position="attributes">
-                     <attribute name="string">Migrate data from another application</attribute>
-                </separator>
-                <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</attribute>
-                </xpath>
-                <xpath expr="//button[@string='Install Modules']" position="attributes">
-                    <attribute name="string">Configure</attribute>
-                </xpath>
-                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                </xpath>
-                <group colspan="8">
-                    <field name="import_saleforce"/>
-                    <field name="import_sugarcrm"/>
-                    <field name="sync_google_contact"/>
-                    <field name="quickbooks_ippids"/>
-                </group>
-            </data>
-        </field>
-    </record>
-
-    <record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
-	     <field name="name">Migrate data from another application</field>
-	     <field name="type">ir.actions.act_window</field>
-	     <field name="res_model">migrade.application.installer.modules</field>
-	     <field name="view_id" ref="view_migrade_application_installer_modules"/>
-	     <field name="view_type">form</field>
-	     <field name="view_mode">form</field>
-	     <field name="target">new</field>
-   </record>
-
-   <record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_migrade_application_installer_modules"/>
-      <field name="category_id" ref="base.category_administration_config"/>
-  </record>
-
-          <!-- Import or create customers configartion view  -->
-
-	 <record id="action_import_create_installer" model="ir.actions.act_window">
-	     <field name="name">Import or Create Customers</field>
-	     <field name="type">ir.actions.act_window</field>
-	     <field name="res_model">res.partner</field>
-	     <field name="view_type">form</field>
-	     <field name="view_mode">tree,form</field>
-	     <field name="view_id" ref="base.view_partner_tree"/>
-	     <field name="help">Create some Customers, Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-	 </record>
-
-    <!--          register configuration wizard -->
-	<record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
-	    <field name="action_id" ref="action_import_create_installer"/>
-	    <field name="category_id" ref="base.category_administration_config"/>
-    </record>
-
-	<!--        Define default users preferences-->
-
-     <record id="view_user_preferences_config_form" model="ir.ui.view">
-          <field name="name">Define default users preferences</field>
-          <field name="model">user.preferences.config</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-          <field name="arch" type="xml">
-            <data>
-              <form position="attributes">
-                <attribute name="string">Define default users preferences</attribute>
-              </form>
-            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <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>
-            </xpath>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                  <attribute name="rowspan">12</attribute>
-            </xpath>
-             <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" name="view"/>
-                        <field colspan="4" name="context_lang"/>
-                        <field colspan="4" name="context_tz"/>
-                        <field colspan="4" name="menu_tips"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-
-      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
-          <field name="name">Define default users preferences</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">user.preferences.config</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="view_user_preferences_config_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-
-      <!--   Register configuration wizard -->
-
-      <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"/>
-      </record>
-
-      <!--     Config Wiz   Create New User's Login   -->
-
-      <record id="action_config_access_other_user" model="ir.actions.act_window">
-          <field name="name">Create New User's Login</field>
-          <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"/>
-      </record>
-
-      <!--   register configuration wizard  -->
-
-      <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>
-
-      <!--   register Upload Logo configuration wizard  -->
-
-      <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
-          <field name="action_id" ref="action_res_company_logo"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-          <field name="state">done</field>
-      </record>
-
-            <!--        Specify Your Terminology Config Wiz-->
-
-     <record id="view_partner_terminology_config_form" model="ir.ui.view">
-          <field name="name">Specify Your Terminology</field>
-          <field name="model">specify.partner.terminology</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-         <field name="arch" type="xml">
-            <data>
-              <form position="attributes">
-                <attribute name="string">Specify Your Terminology</attribute>
-              </form>
-            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <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>
-            </xpath>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                 <attribute name="rowspan">12</attribute>
-            </xpath>
-             <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" name="partner"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-
-      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Customer / Partner / Patient ?</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">specify.partner.terminology</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="view_partner_terminology_config_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-
-      <!--   Register configuration wizard -->
-
-      <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"/>
-      </record>
-
-
-    <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Company Configuration</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="base_setup_company_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">1</field>
-    </record>
-
-  </data>
-</openerp>
-- 
cgit v1.2.3