From f672183ff142178f78df8ec70686bb9ff43057c3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 12:51:34 +0530
Subject: [IMP] Rework-Addons :Improvement Config wiz , ON Addonse Side

bzr revid: aag@tinyerp.co.in-20110301072134-3rrx10e53csav102
---
 addons/base_setup/base_setup_todo.xml |  2 +-
 addons/base_setup/installer.py        | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7cd0563aafe..c3a1bc24a8b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index e23f1171752..bb2626a59ae 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 from osv import fields, osv
+import re
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -101,5 +102,37 @@ class base_setup_installer(osv.osv_memory):
         value.update({'progress':progress})
         if progress < 10.:
             progress = 10.
+        
         return {'value':value}
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        modules = self.pool.get('ir.module.module')
+        modules_selected = []
+        datas = self.read(cr, uid, ids, context=context)[0]
+        key = datas.keys()
+        key.remove("id")
+        key.remove("progress")
+        name_list = []
+        for mod in key:
+            if datas[mod] == 1:
+                modules_selected.append(mod)
+        inst = modules.browse(
+            cr, uid,
+            modules.search(cr, uid,
+                           [('name','in',modules_selected)
+                            ],
+                           context=context),
+            context=context)
+        for i in inst:
+            if i.state == 'uninstalled':
+                sect_mod_id = i.id
+                modules.button_install(cr, uid, [sect_mod_id], context=context)
+            elif i.state == 'installed':
+                if modules_selected:
+                    for instl in modules_selected:
+                        cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
+        
+        return 
 base_setup_installer()
-- 
cgit v1.2.3


From 165ac138532350c8e4ab064e7d618d7d7d88136f Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 14:11:36 +0530
Subject: [IMP] Rework-Addons :Remove import file

bzr revid: aag@tinyerp.co.in-20110301084136-s42s9y4zyk6c9u6g
---
 addons/base_setup/installer.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index bb2626a59ae..a1605fa55bb 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 from osv import fields, osv
-import re
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
-- 
cgit v1.2.3


From 1a809c2f4893d5381fb47326ea122a3f0bd42810 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 16 Mar 2011 17:33:38 +0530
Subject: [IMP]: base_setup: Improvement for the main application: like HR, we
 want them to be able to re-thick an installed application but in HRs
 configuration, if hr_holidays is already installed, the boolean "holidays
 management" should be thick and readonly

bzr revid: rpa@tinyerp.com-20110316120338-zbdm1a6zo0rw76to
---
 addons/base_setup/installer.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index a1605fa55bb..50653e20be7 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -104,6 +104,17 @@ class base_setup_installer(osv.osv_memory):
         
         return {'value':value}
     
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        #Skipping default value as checked for main application, if already installed
+        return super(osv.osv_memory, self).default_get(
+            cr, uid, fields_list, context=context)
+
+    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
+        #Skipping readonly value for main application, if already installed
+        return super(osv.osv_memory, self).fields_get(
+            cr, uid, fields, context, write_access)
+
     def execute(self, cr, uid, ids, context=None):
         if context is None:
              context = {}
-- 
cgit v1.2.3


From 8a4485f2f62164031d376e151bfa8c8e8b629a3c Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 29 Mar 2011 16:02:07 +0530
Subject: [IMP]BASE_SETUP: TASK of REWORK-Remove call of Install btn

bzr revid: aag@tinyerp.co.in-20110329103207-o872ckzew5j7ja8g
---
 addons/base_setup/installer.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 50653e20be7..6c0367816b8 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -119,6 +119,7 @@ class base_setup_installer(osv.osv_memory):
         if context is None:
              context = {}
         modules = self.pool.get('ir.module.module')
+        upgrade_obj = self.pool.get('base.module.upgrade')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
         key = datas.keys()
@@ -138,7 +139,8 @@ class base_setup_installer(osv.osv_memory):
         for i in inst:
             if i.state == 'uninstalled':
                 sect_mod_id = i.id
-                modules.button_install(cr, uid, [sect_mod_id], context=context)
+                modules.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context)
+                upgrade_obj.upgrade_module(cr, uid, [sect_mod_id], context=context)
             elif i.state == 'installed':
                 if modules_selected:
                     for instl in modules_selected:
-- 
cgit v1.2.3


From 527ba1280951490884f453d1de53df015063327e Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 31 Mar 2011 12:22:42 +0530
Subject: [IMP]base_setup:Optimize Code

bzr revid: aag@tinyerp.co.in-20110331065242-hlr92ir0emadiyad
---
 addons/base_setup/installer.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index d324cba2e3f..34c68fcf9f9 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -120,7 +120,6 @@ class base_setup_installer(osv.osv_memory):
         if context is None:
              context = {}
         modules = self.pool.get('ir.module.module')
-        upgrade_obj = self.pool.get('base.module.upgrade')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
         key = datas.keys()
-- 
cgit v1.2.3


From 233084fdc645d939282abef9e452b4c1daa83dea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 31 Mar 2011 10:39:19 +0200
Subject: [IMP] base_setup: set restart=never and state=skip on the 'configure
 your company' wizard

bzr revid: qdp-launchpad@openerp.com-20110331083919-01lwi0uxtbra167f
---
 addons/base_setup/base_setup_todo.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index c3a1bc24a8b..234571b458e 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,8 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">on_trigger</field>
+        <field name="restart">never</field>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
-- 
cgit v1.2.3


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 ++++++++++++++++++++++++++++++
 addons/base_setup/installer.py             | 25 +++++++++++++++
 2 files changed, 75 insertions(+)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 34c68fcf9f9..562301531df 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -148,4 +148,29 @@ class base_setup_installer(osv.osv_memory):
                         cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
         
         return 
+    
 base_setup_installer()
+
+#Migrate data from another application Conf wiz
+
+class migrade_application_installer_modules(osv.osv_memory):
+    _name = 'migrade.application.installer.modules'
+    _inherit = 'res.config.installer'
+    _columns = {
+        'import_saleforce': fields.boolean('Import Saleforce',
+            help="For Import Saleforce"),
+        'import_sugarcrm': fields.boolean('Import Sugarcrm',
+            help="For Import Sugarcrm"),
+        'sync_google_contact': fields.boolean('Sync Google Contact',
+            help="For Sync Google Contact"),
+        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
+            help="For Quickbooks Ippids"),
+    }
+    
+    _defaults = {
+        'import_saleforce': True,
+    }
+
+migrade_application_installer_modules()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
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 ++++++++++++++++++++++++++++++
 addons/base_setup/installer.py             | 34 ++++++++++++++++++++
 2 files changed, 85 insertions(+)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 562301531df..fe63bb9c1e3 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -173,4 +173,38 @@ class migrade_application_installer_modules(osv.osv_memory):
 
 migrade_application_installer_modules()
 
+class product_installer(osv.osv_memory):
+    _name = 'product.installer'
+    _inherit = 'res.config'
+    _columns = {
+                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+
+    }
+    _defaults = {
+                 'customers': 'create',
+    }
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        val = self.browse(cr, uid, ids, context=context)[0]
+        if val.customers == 'create':
+            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'res.partner',
+                    'views': [(id2, 'form')],
+                    'type': 'ir.actions.act_window',
+                    'target': 'current',
+                    'nodestroy':False,
+                }
+        if val.customers == 'import':
+            return {'type': 'ir.actions.act_window'}
+
+product_installer()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
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 +++---
 addons/base_setup/base_setup_todo.xml      | 2 +-
 addons/base_setup/installer.py             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/base_setup')

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>
        
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 234571b458e..7467cad4d4b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">never</field>
+        <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
   </data>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index fe63bb9c1e3..ea9ad555b37 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -145,7 +145,7 @@ class base_setup_installer(osv.osv_memory):
             elif i.state == 'installed':
                 if modules_selected:
                     for instl in modules_selected:
-                        cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
+                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
         
         return 
     
-- 
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')

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')

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 ++++++++++++++++++++++++++++++
 addons/base_setup/installer.py             | 47 +++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index ea9ad555b37..c24277f21ec 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -20,6 +20,7 @@
 ##############################################################################
 from osv import fields, osv
 import pooler
+import pytz
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -207,4 +208,50 @@ class product_installer(osv.osv_memory):
 
 product_installer()
 
+
+#       Define default users preferences config wiz
+
+def _lang_get(self, cr, uid, context=None):
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [('translatable','=',True)])
+    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
+    res = [(r['code'], r['name']) for r in res]
+    return res
+
+def _tz_get(self,cr,uid, context=None):
+    return [(x, x) for x in pytz.all_timezones]
+
+class user_preferences_config(osv.osv_memory):
+    _name = 'user.preferences.config'
+    _inherit = 'res.config'
+    _columns = {
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="Set default for new user's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets default language for the  new user's user interface, when UI "
+                 "translations are available"),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True ),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 
+    }
+    _defaults={
+               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang' : 'en_US',
+               'menu_tips' : True
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        for o in self.browse(cr, uid, ids, context=context):
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
+
+user_preferences_config()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
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')

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/__openerp__.py                   |  1 +
 addons/base_setup/base_setup_installer.xml         | 27 ++++++++++++
 addons/base_setup/wizard/__init__.py               | 25 +++++++++++
 addons/base_setup/wizard/res_company_logo.py       | 49 ++++++++++++++++++++++
 addons/base_setup/wizard/res_company_logo_view.xml | 33 +++++++++++++++
 5 files changed, 135 insertions(+)
 create mode 100644 addons/base_setup/wizard/__init__.py
 create mode 100644 addons/base_setup/wizard/res_company_logo.py
 create mode 100644 addons/base_setup/wizard/res_company_logo_view.xml

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 420deb46bfb..b3b93c21bb7 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -37,6 +37,7 @@ It also helps to easily configure your company.
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
+                   'wizard/res_company_logo_view.xml',
                    'base_setup_installer.xml',
                    'base_setup_todo.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>
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
new file mode 100644
index 00000000000..3c482efa976
--- /dev/null
+++ b/addons/base_setup/wizard/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import res_company_logo
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
new file mode 100644
index 00000000000..df8ace2895c
--- /dev/null
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import os
+import tools
+from tools.translate import _
+
+
+class res_company_logo(osv.osv_memory):
+    _name = 'res.company.logo'
+    _columns = {
+        'logo' : fields.binary('Logo'),
+    }
+    _defaults={
+               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
+     }
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        record_id = context.get('active_id', False) or False
+        comp_obj = self.pool.get("res.company")
+        get_val = self.browse(cr, uid, ids)[0]
+        comp_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+    
+res_company_logo()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
new file mode 100644
index 00000000000..c15810ff3d1
--- /dev/null
+++ b/addons/base_setup/wizard/res_company_logo_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="view_res_company_logo" model="ir.ui.view">
+            <field name="name">res.company.logo.form</field>
+            <field name="model">res.company.logo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Upload Logo">
+                    <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
+                    <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                       <label string="" colspan="2"/>
+                       <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                       <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_res_company_logo" model="ir.actions.act_window">
+            <field name="name">Set Logo</field>
+            <field name="res_model">res.company.logo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_res_company_logo"/>
+            <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
-- 
cgit v1.2.3


From 16e0db32bc50cdef03e303e1e063a16c3b2655b0 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 27 Apr 2011 16:21:35 +0530
Subject: [IMP]: base_setup: Improved query to set the state of config wizard
 of selected module,  before if I select "account" (for example) from the
 application list, it was setting config wizard of account* as todo

bzr revid: rpa@tinyerp.com-20110427105135-98bdd0zcy1jjii5m
---
 addons/base_setup/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 4de276fdce2..911e587d432 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -146,7 +146,7 @@ class base_setup_installer(osv.osv_memory):
             elif i.state == 'installed':
                 if modules_selected:
                     for instl in modules_selected:
-                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module  like '%"+instl+"%'")
+                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module=%s", (instl, ))
         
         return 
     
-- 
cgit v1.2.3


From bb72a48bb9437ec36188c9b48e2c68301adda4e4 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 27 Apr 2011 18:59:22 +0530
Subject: [IMP, REF]: Improved code to install module/update state of its
 config wizard * Added condition so only special config wizards are called on
 selection of a module

bzr revid: rpa@tinyerp.com-20110427132922-wuzn8f2ilvfah1gr
---
 addons/base_setup/installer.py | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 911e587d432..0309318aea0 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -120,35 +120,27 @@ class base_setup_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
              context = {}
-        modules = self.pool.get('ir.module.module')
+        module_pool = self.pool.get('ir.module.module')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
-        key = datas.keys()
-        key.remove("id")
-        key.remove("progress")
-        name_list = []
-        for mod in key:
+        for mod in datas.keys():
+            if mod in ('id', 'progress'):
+                continue
             if datas[mod] == 1:
                 modules_selected.append(mod)
-        inst = modules.browse(
-            cr, uid,
-            modules.search(cr, uid,
-                           [('name','in',modules_selected)
-                            ],
-                           context=context),
-            context=context)
-        for i in inst:
-            if i.state == 'uninstalled':
-                sect_mod_id = i.id
-                modules.state_update(cr, uid, [sect_mod_id], 'to install', ['uninstalled'], context)
+
+        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+        for module in module_pool.browse(cr, uid, module_ids, context=context):
+            if module.state == 'uninstalled':
+                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
                 cr.commit()
                 new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
-            elif i.state == 'installed':
-                if modules_selected:
-                    for instl in modules_selected:
-                        cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model =  'ir.actions.todo' and data.module=%s", (instl, ))
-        
-        return 
+            elif module.state == 'installed':
+                cr.execute("update ir_actions_todo set state='open' \
+                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                                    and ir_actions_todo.type='special'\
+                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+        return
     
 base_setup_installer()
 
-- 
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')

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')

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 f997cb6698ad98ee2c22484946b45b6b9a664b7c Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 29 Apr 2011 12:10:08 +0530
Subject: [IMP]: base_setup: Removed logo field from company setup wizard as we
 have a new wizard to upload logo in form view of company

bzr revid: rpa@tinyerp.com-20110429064008-7v5rvc87vogu10da
---
 addons/base_setup/base_setup_todo.xml | 5 -----
 addons/base_setup/todo.py             | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7467cad4d4b..e4beabea3fd 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -40,11 +40,6 @@
                     <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-
-                    <separator colspan="4"
-                               string="Your Logo - Use a size of about 450x150 pixels."/>
-                    <field colspan="5" name="logo" widget="image"
-                           nolabel="1"/>
                   </group>
             </group>
            </group>
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index f5c8c8d09a6..5cf3eb0c43c 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -72,7 +72,7 @@ class base_setup_company(osv.osv_memory):
             return defaults
 
         defaults['currency'] = company.currency_id.id
-        for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
+        for field in ['name','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]
 
         if company.partner_id.address:
@@ -109,7 +109,6 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
             help='''This sentence will appear at the bottom of your reports.
 We suggest you to put bank information here:
 IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
-        'logo':fields.binary('Logo'),
         'account_no':fields.char('Bank Account No', size=64),
         'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
     }
@@ -126,7 +125,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
             'rml_header1':payload.rml_header1,
             'rml_footer1':payload.rml_footer1,
             'rml_footer2':payload.rml_footer2,
-            'logo':payload.logo,
             'currency_id':payload.currency.id,
             'account_no':payload.account_no,
         })
-- 
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')

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 +-
 addons/base_setup/installer.py             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 0309318aea0..b03418bd114 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -221,8 +221,8 @@ class user_preferences_config(osv.osv_memory):
                  "translations are available"),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
-                                 'Interface', required=True ),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
                                  
     }
     _defaults={
-- 
cgit v1.2.3


From 70d029adba43f14c93f79458550ec1ef70a46cf5 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 5 May 2011 17:58:46 +0530
Subject: [IMP]Base_setup:Pervious values set as Default -Define default users
 preferences

bzr revid: aag@tinyerp.co.in-20110505122846-660ebx0of6vfn42r
---
 addons/base_setup/installer.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index b03418bd114..0019ff9a4f4 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -230,6 +230,15 @@ class user_preferences_config(osv.osv_memory):
                'context_lang' : 'en_US',
                'menu_tips' : True
     }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
+        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
+        for val in range(len(res_default)):
+            res.update({res_default[val][1]:res_default[val][2]})
+        return res    
 
     def execute(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids, context=context):
-- 
cgit v1.2.3


From f710164aff427805f8549e65ac4f9f9128171bf3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 6 May 2011 12:13:03 +0530
Subject: [IMP]Base_setup:Add New Config Wiz - Company Configuration Current
 Form

bzr revid: aag@tinyerp.co.in-20110506064303-uvvsuyg2dyh3lzkh
---
 addons/base_setup/base_setup_todo.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index e4beabea3fd..886de220a87 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -65,5 +65,22 @@
         <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
+ 
+    <record id="action_base_setup_company_current_form2" model="ir.actions.act_window">
+        <field name="name">Company Configuration Current Form</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.company</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="base.view_company_form2"/>
+    </record>
+        
+    <record id="action_base_setup_company_current_form_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_company_current_form2"/>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
+        <field name="target">current</field>
+    </record>
+    
   </data>
 </openerp>
-- 
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 ++++++++
 addons/base_setup/wizard/res_company_logo.py       | 5 +++--
 addons/base_setup/wizard/res_company_logo_view.xml | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
index df8ace2895c..019b0a256c9 100644
--- a/addons/base_setup/wizard/res_company_logo.py
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -37,10 +37,11 @@ class res_company_logo(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        record_id = context.get('active_id', False) or False
+        user_comp_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         comp_obj = self.pool.get("res.company")
         get_val = self.browse(cr, uid, ids)[0]
-        comp_obj.write(cr, uid, record_id, {'logo': get_val.logo}, context=context)
+        if user_comp_id : 
+            comp_obj.write(cr, uid, user_comp_id, {'logo': get_val.logo}, context=context)
         return {'type': 'ir.actions.act_window_close'}
     
 res_company_logo()
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
index c15810ff3d1..c0ed2485752 100644
--- a/addons/base_setup/wizard/res_company_logo_view.xml
+++ b/addons/base_setup/wizard/res_company_logo_view.xml
@@ -7,7 +7,7 @@
             <field name="model">res.company.logo</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Upload Logo">
+                <form string="Upload Your Company Logo">
                     <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
                     <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
                     <separator colspan="4"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="action_res_company_logo" model="ir.actions.act_window">
-            <field name="name">Set Logo</field>
+            <field name="name">Upload Your Company Logo</field>
             <field name="res_model">res.company.logo</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-- 
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')

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 ef362564eb8e786ee34899493efe5a764ee630a4 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 9 May 2011 18:25:22 +0530
Subject: [IMP]Base_setup:Optimize code of res_company_logo

bzr revid: aag@tinyerp.co.in-20110509125522-9gdgffhbytnm6ryj
---
 addons/base_setup/wizard/res_company_logo.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
index 019b0a256c9..2e1b4b6e2aa 100644
--- a/addons/base_setup/wizard/res_company_logo.py
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -37,11 +37,9 @@ class res_company_logo(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        user_comp_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        comp_obj = self.pool.get("res.company")
+        user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         get_val = self.browse(cr, uid, ids)[0]
-        if user_comp_id : 
-            comp_obj.write(cr, uid, user_comp_id, {'logo': get_val.logo}, context=context)
+        user_comp.write({'logo': get_val.logo}, context=context)
         return {'type': 'ir.actions.act_window_close'}
     
 res_company_logo()
-- 
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')

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 33d9a30005937de624b3a9a2cf29d466d30df36d Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 12 May 2011 18:09:20 +0530
Subject: [IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring
 in assign legal leave wizard

bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
---
 addons/base_setup/installer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 0019ff9a4f4..fdd28950094 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -236,9 +236,9 @@ class user_preferences_config(osv.osv_memory):
             context = {}
         res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
         res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
-        for val in range(len(res_default)):
-            res.update({res_default[val][1]:res_default[val][2]})
-        return res    
+        for id, field, value in res_default:
+            res.update({field: value})
+        return res
 
     def execute(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids, context=context):
-- 
cgit v1.2.3


From 4199b38fe71d908339b584c2aed0f6a80661cc58 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 12 May 2011 19:07:36 +0530
Subject: [REM]base_setup:Remove new  company  config wiz

bzr revid: aag@tinyerp.co.in-20110512133736-sdfg0no4k10iccaw
---
 addons/base_setup/base_setup_todo.xml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 886de220a87..6d674ea0915 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -66,21 +66,5 @@
         <field name="state">skip</field>
     </record>
  
-    <record id="action_base_setup_company_current_form2" model="ir.actions.act_window">
-        <field name="name">Company Configuration Current Form</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.company</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="base.view_company_form2"/>
-    </record>
-        
-    <record id="action_base_setup_company_current_form_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company_current_form2"/>
-        <field name="type">normal</field>
-        <field name="state">skip</field>
-        <field name="target">current</field>
-    </record>
-    
   </data>
 </openerp>
-- 
cgit v1.2.3


From 66d7ca89b74a486088e2d2f4f6c095781857bb2f Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 12 May 2011 19:09:28 +0530
Subject: [IMP]: base: Improvement in company config wizard

bzr revid: rpa@tinyerp.com-20110512133928-c6u5675fiurn7cf3
---
 addons/base_setup/base_setup_todo.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index e4beabea3fd..1a148c517c3 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -53,10 +53,9 @@
       <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.company</field>
-      <field name="view_id" ref="view_base_setup_company"/>
+      <field name="view_id" ref="base.view_company_form"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
-      <field name="target">new</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
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 +-
 addons/base_setup/base_setup_todo.xml      | 48 ------------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

(limited to 'addons/base_setup')

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">
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index aa39f270e64..f6b353bc937 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,53 +1,5 @@
 <openerp>
   <data>
-    <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Company Configuration</field>
-      <field name="model">base.setup.company</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">Company Configuration</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company Information</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>25</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="5">
-                  <group colspan="2">
-                    <field name="company_id" invisible="1"/>
-                    <field name="name" required="True"/><field name="website"/>
-                    <field name="street"/><field name="street2"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="state_id"/>
-                    <field name="phone"/>
-                    <field name="email"/>
-                    <field name="account_no"/>
-                    <field name="currency" widget="selection"/>
-                </group>
-                <newline/>
-                <group colspan="2">
-                    <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-                  </group>
-            </group>
-           </group>
-
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
-        </data>
-      </field>
-    </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
       <field name="name">Company Configuration</field>
-- 
cgit v1.2.3


From dfc9b4413901ecfb9aae163ffb9f44400038ea16 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 13 May 2011 14:30:09 +0530
Subject: [IMP]: base_setup: in the main config wizard: we should have as
 before, if a module is installed, then it should appear as ticked and
 readonly

bzr revid: rpa@tinyerp.com-20110513090009-gbfvlv7tqbwx6d2f
---
 addons/base_setup/installer.py | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index fdd28950094..9fb07217795 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -105,17 +105,7 @@ class base_setup_installer(osv.osv_memory):
             progress = 10.
         
         return {'value':value}
-    
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        #Skipping default value as checked for main application, if already installed
-        return super(osv.osv_memory, self).default_get(
-            cr, uid, fields_list, context=context)
 
-    def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
-        #Skipping readonly value for main application, if already installed
-        return super(osv.osv_memory, self).fields_get(
-            cr, uid, fields, context, write_access)
 
     def execute(self, cr, uid, ids, context=None):
         if context is None:
-- 
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 +++++++++++++++++++++++
 addons/base_setup/installer.py             | 64 ++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9fb07217795..ee7d5f53ab8 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -241,4 +241,68 @@ class user_preferences_config(osv.osv_memory):
 
 user_preferences_config()
 
+# Specify Your Terminology
+
+class specify_partner_terminology(osv.osv_memory):
+    _name = 'specify.partner.terminology'
+    _inherit = 'res.config'
+    _columns = {
+        'partner': fields.selection([('Customer','Customer'),
+                                  ('Client','Client'),
+                                  ('Member','Member'),
+                                  ('Patient','Patient'),
+                                  ('Partner','Partner'),
+                                  ('Donor','Donor'),
+                                  ('Guest','Guest'),
+                                  ('Tenant','Tenant')
+                                  ],
+                                 'Choose how to call a customer', required=True ),
+    }
+    _defaults={
+               'partner' :'Partner',
+    }
+    
+    def translations_done(self, cr, uid, ids, name, type, src, value,res_id = 0, context=None):
+        trans_obj = self.pool.get('ir.translation')
+        user_obj = self.pool.get('res.users')
+        context_lang = user_obj.browse(cr ,uid ,uid , context=context).context_lang
+        already_id = trans_obj.search(cr,uid, [('name','=',name),('res_id','=',res_id)])
+        for un_id in already_id:
+            trans_obj.write(cr ,uid, un_id, {'name': name ,'lang': context_lang, 'type': type,  'src': src, 'value': value , 'res_id':res_id}, context=context)
+        if not already_id:
+            create_id = trans_obj.create(cr, uid, {'name': name ,'lang': context_lang, 'type': type,  'src': src, 'value': value , 'res_id':res_id}, context=context)
+        return {}
+    
+    
+    def execute(self, cr, uid, ids, context=None):
+        trans_obj = self.pool.get('ir.translation')
+        fields_obj = self.pool.get('ir.model.fields')
+        menu_obj= self.pool.get('ir.ui.menu')
+        for o in self.browse(cr, uid, ids, context=context):
+            model_partner_ids = fields_obj.search(cr,uid, [('field_description','ilike','Partner')])
+            menu_partner_ids = menu_obj.search(cr,uid, [('name','ilike','Partner')])
+            # For Partner Translation
+            for p_id in model_partner_ids:
+                brw_fields_obj = fields_obj.browse(cr ,uid ,p_id , context=context)
+                name1 = brw_fields_obj.field_description
+                name2 = name1.replace('Partner',o.partner)
+                obj2 = brw_fields_obj.model_id.model
+                field = brw_fields_obj.name
+                partner_name = obj2 +',' + field
+                self.translations_done(cr, uid, ids, partner_name, 'field', name1 ,name2 ,context=context )
+                    
+            for m_id in menu_partner_ids:
+                brw_menu_obj = menu_obj.browse(cr ,uid ,m_id , context=context)
+                menu_partner_name1 = brw_menu_obj.name
+                menu_partnr_name = 'ir.ui.menu' + ',' + 'name'
+                already_id = trans_obj.search(cr,uid, [('name','=',menu_partnr_name),('res_id','=',m_id)])
+                if already_id:
+                    menu_partner_name1 = trans_obj.browse(cr, uid, already_id[0], context=context).src
+                menu_partner_name2 = menu_partner_name1.replace('Partner',o.partner)
+                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name2, m_id ,context=context )
+                    
+        return {}
+    
+specify_partner_terminology()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 0f7d9bb5e287c54a2e56234891fe0d6da4b22efe Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 18 May 2011 18:49:53 +0530
Subject: [IMP]Base_setup:Optimize Code of config wiz  Terminology

bzr revid: aag@tinyerp.co.in-20110518131953-rdvjobg9tcn563r1
---
 addons/base_setup/installer.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index ee7d5f53ab8..780aac9af52 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -284,12 +284,8 @@ class specify_partner_terminology(osv.osv_memory):
             # For Partner Translation
             for p_id in model_partner_ids:
                 brw_fields_obj = fields_obj.browse(cr ,uid ,p_id , context=context)
-                name1 = brw_fields_obj.field_description
-                name2 = name1.replace('Partner',o.partner)
-                obj2 = brw_fields_obj.model_id.model
-                field = brw_fields_obj.name
-                partner_name = obj2 +',' + field
-                self.translations_done(cr, uid, ids, partner_name, 'field', name1 ,name2 ,context=context )
+                partner_name = brw_fields_obj.model_id.model +',' + brw_fields_obj.name
+                self.translations_done(cr, uid, ids, partner_name, 'field', brw_fields_obj.field_description ,brw_fields_obj.field_description.replace('Partner',o.partner) ,context=context )
                     
             for m_id in menu_partner_ids:
                 brw_menu_obj = menu_obj.browse(cr ,uid ,m_id , context=context)
-- 
cgit v1.2.3


From 61792fc2f0580b6e6be2c06b8c28aed58f83642a Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 18 May 2011 19:03:59 +0530
Subject: [IMP]Base_setup:Optimize Code of config wiz  Terminology

bzr revid: aag@tinyerp.co.in-20110518133359-z7rhqpurlw8zh6z8
---
 addons/base_setup/installer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 780aac9af52..95462367f83 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -294,8 +294,7 @@ class specify_partner_terminology(osv.osv_memory):
                 already_id = trans_obj.search(cr,uid, [('name','=',menu_partnr_name),('res_id','=',m_id)])
                 if already_id:
                     menu_partner_name1 = trans_obj.browse(cr, uid, already_id[0], context=context).src
-                menu_partner_name2 = menu_partner_name1.replace('Partner',o.partner)
-                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name2, m_id ,context=context )
+                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name1.replace('Partner',o.partner), m_id ,context=context )
                     
         return {}
     
-- 
cgit v1.2.3


From ae588289825751d2cdcab3b75aeb46e0f9bbc3b9 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 18 May 2011 19:21:38 +0530
Subject: [IMP]Base_setup:Optimize Code of config wiz  Terminology

bzr revid: aag@tinyerp.co.in-20110518135138-ixkc0qqfh09p6sy5
---
 addons/base_setup/installer.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 95462367f83..fd5eb444b3b 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -282,19 +282,17 @@ class specify_partner_terminology(osv.osv_memory):
             model_partner_ids = fields_obj.search(cr,uid, [('field_description','ilike','Partner')])
             menu_partner_ids = menu_obj.search(cr,uid, [('name','ilike','Partner')])
             # For Partner Translation
-            for p_id in model_partner_ids:
-                brw_fields_obj = fields_obj.browse(cr ,uid ,p_id , context=context)
-                partner_name = brw_fields_obj.model_id.model +',' + brw_fields_obj.name
-                self.translations_done(cr, uid, ids, partner_name, 'field', brw_fields_obj.field_description ,brw_fields_obj.field_description.replace('Partner',o.partner) ,context=context )
+            for p_id in fields_obj.browse(cr ,uid ,model_partner_ids , context=context):
+                partner_name = p_id.model_id.model +',' + p_id.name
+                self.translations_done(cr, uid, ids, partner_name, 'field', p_id.field_description ,p_id.field_description.replace('Partner',o.partner) ,context=context )
                     
-            for m_id in menu_partner_ids:
-                brw_menu_obj = menu_obj.browse(cr ,uid ,m_id , context=context)
-                menu_partner_name1 = brw_menu_obj.name
+            for m_id in menu_obj.browse(cr ,uid ,menu_partner_ids , context=context):
+                menu_partner_name1 = m_id.name
                 menu_partnr_name = 'ir.ui.menu' + ',' + 'name'
-                already_id = trans_obj.search(cr,uid, [('name','=',menu_partnr_name),('res_id','=',m_id)])
+                already_id = trans_obj.search(cr,uid, [('name','=',menu_partnr_name),('res_id','=',m_id.id)])
                 if already_id:
                     menu_partner_name1 = trans_obj.browse(cr, uid, already_id[0], context=context).src
-                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name1.replace('Partner',o.partner), m_id ,context=context )
+                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name1.replace('Partner',o.partner), m_id.id ,context=context )
                     
         return {}
     
-- 
cgit v1.2.3


From dc018b5752adf6827a0d4b54d6034c0a2ea9cc9f Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 19 May 2011 14:40:19 +0530
Subject: [IMP]Base_setup : Add tooltip to language Define default users
 preferences

bzr revid: aag@tinyerp.co.in-20110519091019-jhu0c9hxxdguogc6
---
 addons/base_setup/installer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9fb07217795..40ec1ad386b 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -207,8 +207,7 @@ class user_preferences_config(osv.osv_memory):
             help="Set default for new user's timezone, used to perform timezone conversions "
                  "between the server and the client."),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets default language for the  new user's user interface, when UI "
-                 "translations are available"),
+            help="Where we go if we want another languages ?"),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
                                  'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
-- 
cgit v1.2.3


From 0cba9e7e34fc862da6b0fc76764940d8c49e8e99 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 19 May 2011 15:13:46 +0530
Subject: [IMP]Base_setup : Add tooltip to language Define default users
 preferences

bzr revid: aag@tinyerp.co.in-20110519094346-kpxmy53k83yi5vqm
---
 addons/base_setup/installer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 40ec1ad386b..4a58cd057f8 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -207,7 +207,8 @@ class user_preferences_config(osv.osv_memory):
             help="Set default for new user's timezone, used to perform timezone conversions "
                  "between the server and the client."),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Where we go if we want another languages ?"),
+            help="Sets default language for the  all user interface, when UI "
+                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
                                  'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
-- 
cgit v1.2.3


From 33ddb73f3128a2b24b110570e423010158e13f48 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 19 May 2011 17:30:35 +0530
Subject: [IMP]Base_setup:Optimize Code of config wiz  Terminology

bzr revid: aag@tinyerp.co.in-20110519120035-qw92yr2pqnlbify3
---
 addons/base_setup/installer.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index fd5eb444b3b..1cd2fbba7af 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -262,38 +262,33 @@ class specify_partner_terminology(osv.osv_memory):
                'partner' :'Partner',
     }
     
-    def translations_done(self, cr, uid, ids, name, type, src, value,res_id = 0, context=None):
+    def translations_done(self, cr, uid, ids, name, type, src, value, res_id = 0, context=None):
         trans_obj = self.pool.get('ir.translation')
         user_obj = self.pool.get('res.users')
-        context_lang = user_obj.browse(cr ,uid ,uid , context=context).context_lang
-        already_id = trans_obj.search(cr,uid, [('name','=',name),('res_id','=',res_id)])
+        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
+        already_id = trans_obj.search(cr, uid, [('name','=',name),('res_id','=',res_id)])
         for un_id in already_id:
-            trans_obj.write(cr ,uid, un_id, {'name': name ,'lang': context_lang, 'type': type,  'src': src, 'value': value , 'res_id':res_id}, context=context)
+            trans_obj.write(cr, uid, un_id, {'name': name, 'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id':res_id }, context=context)
         if not already_id:
-            create_id = trans_obj.create(cr, uid, {'name': name ,'lang': context_lang, 'type': type,  'src': src, 'value': value , 'res_id':res_id}, context=context)
+            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id':res_id}, context=context)
         return {}
     
     
     def execute(self, cr, uid, ids, context=None):
         trans_obj = self.pool.get('ir.translation')
         fields_obj = self.pool.get('ir.model.fields')
-        menu_obj= self.pool.get('ir.ui.menu')
+        menu_obj = self.pool.get('ir.ui.menu')
         for o in self.browse(cr, uid, ids, context=context):
-            model_partner_ids = fields_obj.search(cr,uid, [('field_description','ilike','Partner')])
+            model_partner_ids = fields_obj.search(cr, uid, [('field_description','ilike','Partner')])
             menu_partner_ids = menu_obj.search(cr,uid, [('name','ilike','Partner')])
-            # For Partner Translation
-            for p_id in fields_obj.browse(cr ,uid ,model_partner_ids , context=context):
+            for p_id in fields_obj.browse(cr ,uid ,model_partner_ids, context=context):
                 partner_name = p_id.model_id.model +',' + p_id.name
-                self.translations_done(cr, uid, ids, partner_name, 'field', p_id.field_description ,p_id.field_description.replace('Partner',o.partner) ,context=context )
-                    
-            for m_id in menu_obj.browse(cr ,uid ,menu_partner_ids , context=context):
+                self.translations_done(cr, uid, ids, partner_name, 'field', p_id.field_description, p_id.field_description.replace('Partner',o.partner), context=context)
+            for m_id in menu_obj.browse(cr, uid, menu_partner_ids, context=context):
                 menu_partner_name1 = m_id.name
                 menu_partnr_name = 'ir.ui.menu' + ',' + 'name'
-                already_id = trans_obj.search(cr,uid, [('name','=',menu_partnr_name),('res_id','=',m_id.id)])
-                if already_id:
-                    menu_partner_name1 = trans_obj.browse(cr, uid, already_id[0], context=context).src
-                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1 , menu_partner_name1.replace('Partner',o.partner), m_id.id ,context=context )
-                    
+                already_id = trans_obj.search(cr, uid, [('name','=',menu_partnr_name), ('res_id','=',m_id.id)])
+                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1, menu_partner_name1.replace('Partner',o.partner), m_id.id, context=context)
         return {}
     
 specify_partner_terminology()
-- 
cgit v1.2.3


From cc0af89e8b3ea49da243b1c35e7e879edf5d2099 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 20 May 2011 10:48:00 +0530
Subject: [IMP]Base_setup :Remove two spaces between "the  all" in tooltip of
 language

bzr revid: aag@tinyerp.co.in-20110520051800-1oobwmiijti3jj2i
---
 addons/base_setup/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 4a58cd057f8..424c63a218f 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -207,7 +207,7 @@ class user_preferences_config(osv.osv_memory):
             help="Set default for new user's timezone, used to perform timezone conversions "
                  "between the server and the client."),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets default language for the  all user interface, when UI "
+            help="Sets default language for the all user interface, when UI "
                 "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
-- 
cgit v1.2.3


From 633fb5ba227ee0a2f579c5ea68864d20db2258ed Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 25 May 2011 14:47:36 +0200
Subject: [IMP] base_setup: specify your terminology wizard

bzr revid: qdp-launchpad@openerp.com-20110525124736-t9fx3bhy9nyu2r96
---
 addons/base_setup/installer.py | 55 +++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 17 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 1cd2fbba7af..ecdafb22c8e 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -262,33 +262,54 @@ class specify_partner_terminology(osv.osv_memory):
                'partner' :'Partner',
     }
     
-    def translations_done(self, cr, uid, ids, name, type, src, value, res_id = 0, context=None):
+    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
         trans_obj = self.pool.get('ir.translation')
         user_obj = self.pool.get('res.users')
         context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
-        already_id = trans_obj.search(cr, uid, [('name','=',name),('res_id','=',res_id)])
-        for un_id in already_id:
-            trans_obj.write(cr, uid, un_id, {'name': name, 'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id':res_id }, context=context)
-        if not already_id:
-            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id':res_id}, context=context)
+        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src)])
+        if existing_trans_ids:
+            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
+        else:
+            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
         return {}
     
-    
     def execute(self, cr, uid, ids, context=None):
+        def _case_insensitive_replace(ref_string, src, value):
+            import re
+            pattern = re.compile(src, re.IGNORECASE)
+            return pattern.sub(value, ref_string)
         trans_obj = self.pool.get('ir.translation')
         fields_obj = self.pool.get('ir.model.fields')
         menu_obj = self.pool.get('ir.ui.menu')
+        act_window_obj = self.pool.get('ir.actions.act_window')
         for o in self.browse(cr, uid, ids, context=context):
-            model_partner_ids = fields_obj.search(cr, uid, [('field_description','ilike','Partner')])
-            menu_partner_ids = menu_obj.search(cr,uid, [('name','ilike','Partner')])
-            for p_id in fields_obj.browse(cr ,uid ,model_partner_ids, context=context):
-                partner_name = p_id.model_id.model +',' + p_id.name
-                self.translations_done(cr, uid, ids, partner_name, 'field', p_id.field_description, p_id.field_description.replace('Partner',o.partner), context=context)
-            for m_id in menu_obj.browse(cr, uid, menu_partner_ids, context=context):
-                menu_partner_name1 = m_id.name
-                menu_partnr_name = 'ir.ui.menu' + ',' + 'name'
-                already_id = trans_obj.search(cr, uid, [('name','=',menu_partnr_name), ('res_id','=',m_id.id)])
-                self.translations_done(cr, uid, ids, menu_partnr_name, 'model', menu_partner_name1, menu_partner_name1.replace('Partner',o.partner), m_id.id, context=context)
+            #translate label of field
+            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
+            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
+                field_ref = f_id.model_id.model + ',' + f_id.name
+                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
+            #translate help tooltip of field
+            for obj in self.pool.obj_pool.values():
+                for field_name, field_rec in obj._columns.items():
+                    if field_rec.help.lower().count('customer'):
+                        field_ref = obj._name + ',' + field_name
+                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
+            #translate menuitems
+            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
+            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
+                menu_name = m_id.name
+                menu_ref = 'ir.ui.menu' + ',' + 'name'
+                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
+            #translate act window name
+            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'name'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
+            #translate act window tooltips
+            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'help'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
     
 specify_partner_terminology()
-- 
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')

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')

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 b8c220d8d4ea07bcae2ccad6ed7ca85d0d7d3af0 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 18:18:35 +0530
Subject: [IMP]Base_setup:write the values on all existing User also by user
 preferences wiz

bzr revid: aag@tinyerp.co.in-20110527124835-2aeyavyqnoj4vv2y
---
 addons/base_setup/installer.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 317102f654a..e360baada2c 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -231,7 +231,10 @@ class user_preferences_config(osv.osv_memory):
         return res
 
     def execute(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        user_ids = user_obj.search(cr, uid, [], context=context)
         for o in self.browse(cr, uid, ids, context=context):
+            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
             ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
-- 
cgit v1.2.3


From e97aed71bcdb0f3d6eeed2fdd8b575a4cd4d6fb5 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 31 May 2011 18:27:10 +0530
Subject: [ADD]Base_setup:In Company Configuration  add category compnay

bzr revid: aag@tinyerp.co.in-20110531125710-5cylzye6eaki36a2
---
 addons/base_setup/base_setup_todo.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index f6b353bc937..7da7142ae3d 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -9,9 +9,15 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
     </record>
+    
+    <record id="category_base_setup_company" model="ir.actions.todo.category">
+      <field name="name">Company</field>
+      <field name="sequence">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="category_base_setup_company"/>
         <field name="sequence">1</field>
         <field name="type">normal</field>
         <field name="state">skip</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')

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')

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')

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')

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')

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 bfbba02ce48215c5ef3de332a7ccd4ec243ba26b Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 11:58:15 +0530
Subject: [ADD]Base_setup:In Company Configuration  add add to Admin - 2 seq 
 category

bzr revid: aag@tinyerp.co.in-20110601062815-0rixgmjpej97nhg1
---
 addons/base_setup/base_setup_todo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7da7142ae3d..caaedeef974 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,8 +11,8 @@
     </record>
     
     <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Company</field>
-      <field name="sequence">1</field>
+      <field name="name">Admin</field>
+      <field name="sequence">2</field>
     </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
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')

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')

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')

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')

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 4780b6202b86175bbbd7f967aaac06e3da05c9ce Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:07:44 +0530
Subject: [IMP]base_setup:Company Configuration in Administration-1 categ

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

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index caaedeef974..b8355778c95 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,8 +11,8 @@
     </record>
     
     <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Admin</field>
-      <field name="sequence">2</field>
+      <field name="name">Administration</field>
+      <field name="sequence">1</field>
     </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
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')

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')

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 7db540e4eea26db44513e883f0504eeed41268e2 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:36:36 +0530
Subject: [IMP]base_setup:Company Configuration in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603070636-510h01n0phpdn9d9
---
 addons/base_setup/base_setup_todo.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index b8355778c95..7ea8e9e3a05 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -9,15 +9,10 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
     </record>
-    
-    <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Administration</field>
-      <field name="sequence">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="category_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>
-- 
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')

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')

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')

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')

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')

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')

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')

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')

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')

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 1f72944b64597a9575d898b5b049c947c4cb261c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 10 Jun 2011 13:11:25 +0200
Subject: [FIX] base_setup: specify your terminology wizard

bzr revid: qdp-launchpad@openerp.com-20110610111125-cenc0t1ui96407n4
---
 addons/base_setup/installer.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index e360baada2c..325edac8fd3 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -21,6 +21,7 @@
 from osv import fields, osv
 import pooler
 import pytz
+from tools.translate import _
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -269,7 +270,7 @@ class specify_partner_terminology(osv.osv_memory):
         trans_obj = self.pool.get('ir.translation')
         user_obj = self.pool.get('res.users')
         context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
-        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src)])
+        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
         if existing_trans_ids:
             trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
         else:
@@ -280,7 +281,7 @@ class specify_partner_terminology(osv.osv_memory):
         def _case_insensitive_replace(ref_string, src, value):
             import re
             pattern = re.compile(src, re.IGNORECASE)
-            return pattern.sub(value, ref_string)
+            return pattern.sub(_(value), _(ref_string))
         trans_obj = self.pool.get('ir.translation')
         fields_obj = self.pool.get('ir.model.fields')
         menu_obj = self.pool.get('ir.ui.menu')
-- 
cgit v1.2.3


From 97d397c87d0c353832466059d0fd7307c1b41f98 Mon Sep 17 00:00:00 2001
From: mma <>
Date: Wed, 15 Jun 2011 11:29:43 +0200
Subject: [IMP] base_setup: upload your logo wizard.

bzr revid: qdp-launchpad@openerp.com-20110615092943-v1d88dx2rkrs4tbg
---
 addons/base_setup/wizard/res_company_logo.py       |  1 +
 addons/base_setup/wizard/res_company_logo_view.xml | 33 ++++++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
index 2e1b4b6e2aa..255b0e89408 100644
--- a/addons/base_setup/wizard/res_company_logo.py
+++ b/addons/base_setup/wizard/res_company_logo.py
@@ -27,6 +27,7 @@ from tools.translate import _
 
 class res_company_logo(osv.osv_memory):
     _name = 'res.company.logo'
+    _inherit = 'res.config'
     _columns = {
         'logo' : fields.binary('Logo'),
     }
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
index c0ed2485752..a21fd261dd8 100644
--- a/addons/base_setup/wizard/res_company_logo_view.xml
+++ b/addons/base_setup/wizard/res_company_logo_view.xml
@@ -6,17 +6,32 @@
             <field name="name">res.company.logo.form</field>
             <field name="model">res.company.logo</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Upload Your Company Logo">
-                    <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
-                    <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                       <label string="" colspan="2"/>
-                       <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                       <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
-                    </group>
+            <data>
+                <form position="attributes">
+                     <attribute name="string">Upload Your Company Logo</attribute>
                 </form>
+                <xpath expr='//separator[@string="title"]' position='attributes'>
+                   <attribute name='string'> </attribute>
+                </xpath>
+                <xpath expr="//label[@string='description']"
+                      position="attributes">
+                      <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                     <attribute name='string'> </attribute>
+                     <attribute name='rowspan'>12</attribute>
+                 </xpath>
+                 <xpath expr="//button[@string='Next']" position="replace">
+                      <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+                  </xpath>
+                 <group string="res_config_contents" position="replace">
+                    <group colspan="4">
+                        <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
+                  </group>
+                </group>
+             </data>
             </field>
         </record>
 
-- 
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')

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')

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')

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 a62aacaf7cc2d428f1b941a9546efeeb2ec807c9 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 24 Jun 2011 19:08:00 +0530
Subject: [IMP]: base_setup: Added context to open company wizard with data
 filled

bzr revid: rpa@tinyerp.com-20110624133800-q3owydbtbwz54e7d
---
 addons/base_setup/base_setup_todo.xml |   1 +
 addons/base_setup/todo.py             | 140 ++++------------------------------
 2 files changed, 17 insertions(+), 124 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7ea8e9e3a05..6408cc08bba 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -8,6 +8,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>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 5cf3eb0c43c..3fa590bc9b5 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -18,10 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from operator import itemgetter
 
-from osv import osv, fields
-import netsvc
+from osv import osv
 import tools
 
 class base_setup_company(osv.osv_memory):
@@ -29,131 +27,25 @@ class base_setup_company(osv.osv_memory):
     """
     _name = 'base.setup.company'
     _inherit = 'res.config'
-    logger = netsvc.Logger()
-
-    def _get_all(self, cr, uid, model, context=None):
-        models = self.pool.get(model)
-        all_model_ids = models.search(cr, uid, [])
-
-        output = [(False, '')]
-        output.extend(
-            sorted([(o.id, o.name)
-                    for o in models.browse(cr, uid, all_model_ids,
-                                           context=context)],
-                   key=itemgetter(1)))
-        return output
-
-    def _get_all_states(self, cr, uid, context=None):
-        return self._get_all(
-            cr, uid, 'res.country.state', context=context)
-    def _get_all_countries(self, cr, uid, context=None):
-        return self._get_all(cr, uid, 'res.country', context=context)
-
-    def _show_company_data(self, cr, uid, context=None):
-        # We only want to show the default company data in demo mode, otherwise users tend to forget
-        # to fill in the real company data in their production databases
-        return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'module_meta_information').demo
-
-
-    def default_get(self, cr, uid, fields_list=None, context=None):
-        """ get default company if any, and the various other fields
-        from the company's fields
-        """
-        defaults = super(base_setup_company, self)\
-              .default_get(cr, uid, fields_list=fields_list, context=context)
-        companies = self.pool.get('res.company')
-        company_id = companies.search(cr, uid, [], limit=1, order="id")
-        if not company_id or 'company_id' not in fields_list:
-            return defaults
-        company = companies.browse(cr, uid, company_id[0], context=context)
-        defaults['company_id'] = company.id
-
-        if not self._show_company_data(cr, uid, context=context):
-            return defaults
-
-        defaults['currency'] = company.currency_id.id
-        for field in ['name','rml_header1','rml_footer1','rml_footer2']:
-            defaults[field] = company[field]
-
-        if company.partner_id.address:
-            address = company.partner_id.address[0]
-            for field in ['street','street2','zip','city','email','phone']:
-                defaults[field] = address[field]
-            for field in ['country_id','state_id']:
-                if address[field]:
-                    defaults[field] = address[field].id
-
-        return defaults
-
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company'),
-        'name':fields.char('Company Name', size=64, required=True),
-        'street':fields.char('Street', size=128),
-        'street2':fields.char('Street 2', size=128),
-        'zip':fields.char('Zip Code', size=24),
-        'city':fields.char('City', size=128),
-        'state_id':fields.selection(_get_all_states, 'Fed. State'),
-        'country_id':fields.selection(_get_all_countries, 'Country'),
-        'email':fields.char('E-mail', size=64),
-        'phone':fields.char('Phone', size=64),
-        'currency':fields.many2one('res.currency', 'Currency', required=True),
-        'rml_header1':fields.char('Report Header', size=200,
-            help='''This sentence will appear at the top right corner of your reports.
-We suggest you to put a slogan here:
-"Open Source Business Solutions".'''),
-        'rml_footer1':fields.char('Report Footer 1', size=200,
-            help='''This sentence will appear at the bottom of your reports.
-We suggest you to write legal sentences here:
-Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07'''),
-        'rml_footer2':fields.char('Report Footer 2', size=200,
-            help='''This sentence will appear at the bottom of your reports.
-We suggest you to put bank information here:
-IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
-        'account_no':fields.char('Bank Account No', size=64),
-        'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
-    }
 
     def execute(self, cr, uid, ids, context=None):
-        assert len(ids) == 1, "We should only get one object from the form"
-        payload = self.browse(cr, uid, ids[0], context=context)
-        if not getattr(payload, 'company_id', None):
-            raise ValueError('Case where no default main company is setup '
-                             'not handled yet')
-        company = payload.company_id
-        company.write({
-            'name':payload.name,
-            'rml_header1':payload.rml_header1,
-            'rml_footer1':payload.rml_footer1,
-            'rml_footer2':payload.rml_footer2,
-            'currency_id':payload.currency.id,
-            'account_no':payload.account_no,
-        })
-
-        company.partner_id.write({
-            'name':payload.name,
-            'website':payload.website,
-        })
-
-        address_data = {
-            'name':payload.name,
-            'street':payload.street,
-            'street2':payload.street2,
-            'zip':payload.zip,
-            'city':payload.city,
-            'email':payload.email,
-            'phone':payload.phone,
-            'country_id':int(payload.country_id),
-            'state_id':int(payload.state_id),
+        ir_pool = self.pool.get('ir.model.data')
+        model, company_view_form = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_form')
+        model, company_view_tree = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_tree')
+        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
+        return {
+            'name': _('Configure Company'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'crm.lead',
+            'domain': [('id', '=', company_id)],
+            'res_id': company_id,
+            'view_id': False,
+            'views': [(company_view_form, 'form'),
+                      (company_view_tree, 'tree')],
+            'type': 'ir.actions.act_window'
         }
 
-        if company.partner_id.address:
-            company.partner_id.address[0].write(
-                address_data)
-        else:
-            self.pool.get('res.partner.address').create(cr, uid,
-                    dict(address_data,
-                         partner_id=int(company.partner_id)),
-                    context=context)
 base_setup_company()
 
 class res_currency(osv.osv):
-- 
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/__init__.py              |  1 -
 addons/base_setup/__openerp__.py           |  1 -
 addons/base_setup/base_setup_installer.xml | 75 +++++++++++++++++++-----------
 addons/base_setup/base_setup_todo.xml      | 23 ---------
 addons/base_setup/installer.py             | 20 ++++++++
 addons/base_setup/todo.py                  | 68 ---------------------------
 6 files changed, 67 insertions(+), 121 deletions(-)
 delete mode 100644 addons/base_setup/base_setup_todo.xml
 delete mode 100644 addons/base_setup/todo.py

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 9ed5ec84535..2dab90b90b2 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import installer
-import todo
 import wizard
 import os
 import base64
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index b3b93c21bb7..39a417460b0 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -39,7 +39,6 @@ It also helps to easily configure your company.
     'update_xml': ['security/ir.model.access.csv',
                    'wizard/res_company_logo_view.xml',
                    'base_setup_installer.xml',
-                   'base_setup_todo.xml',
                    ],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
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>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
deleted file mode 100644
index 6408cc08bba..00000000000
--- a/addons/base_setup/base_setup_todo.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-
-    <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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 325edac8fd3..8473214d20f 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -22,6 +22,7 @@ from osv import fields, osv
 import pooler
 import pytz
 from tools.translate import _
+import tools
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
@@ -318,4 +319,23 @@ class specify_partner_terminology(osv.osv_memory):
     
 specify_partner_terminology()
 
+
+# this code is needed to be moved in main currency class
+class res_currency(osv.osv):
+    _inherit = 'res.currency'
+
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+#        We can use the following line,if we want to restrict this name_get for company setup only
+#        But, its better to show currencies as name(Code).
+        if not len(ids):
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
+        return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads]
+
+res_currency()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
deleted file mode 100644
index 3fa590bc9b5..00000000000
--- a/addons/base_setup/todo.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv
-import tools
-
-class base_setup_company(osv.osv_memory):
-    """
-    """
-    _name = 'base.setup.company'
-    _inherit = 'res.config'
-
-    def execute(self, cr, uid, ids, context=None):
-        ir_pool = self.pool.get('ir.model.data')
-        model, company_view_form = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_form')
-        model, company_view_tree = ir_pool.get_object_reference(cr, uid, 'base', 'view_company_tree')
-        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
-        return {
-            'name': _('Configure Company'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.lead',
-            'domain': [('id', '=', company_id)],
-            'res_id': company_id,
-            'view_id': False,
-            'views': [(company_view_form, 'form'),
-                      (company_view_tree, 'tree')],
-            'type': 'ir.actions.act_window'
-        }
-
-base_setup_company()
-
-class res_currency(osv.osv):
-    _inherit = 'res.currency'
-
-    def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-#        We can use the following line,if we want to restrict this name_get for company setup only
-#        But, its better to show currencies as name(Code).
-        if not len(ids):
-            return []
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
-        return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads]
-
-res_currency()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From d5f84bcceffd0708f9d2dc61fdebc802345e0ebb Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 28 Jun 2011 15:25:16 +0530
Subject: [REM]: base_setup: Moved name_get of res.currency at server side

bzr revid: rpa@tinyerp.com-20110628095516-nb986uegxx0w6w5p
---
 addons/base_setup/installer.py | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 8473214d20f..56a61eecc3b 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -320,22 +320,4 @@ class specify_partner_terminology(osv.osv_memory):
 specify_partner_terminology()
 
 
-# this code is needed to be moved in main currency class
-class res_currency(osv.osv):
-    _inherit = 'res.currency'
-
-    def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-#        We can use the following line,if we want to restrict this name_get for company setup only
-#        But, its better to show currencies as name(Code).
-        if not len(ids):
-            return []
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
-        return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads]
-
-res_currency()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
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')

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')

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 6e6e7b8896829863f467e5e02c774da06ddfdc48 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Jun 2011 14:43:20 +0200
Subject: [IMP] base_setup: install account_voucher when installing any of
 these applications: sale, purchase, account

bzr revid: qdp-launchpad@openerp.com-20110630124320-hktjcksgnv23k2y6
---
 addons/base_setup/installer.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 56a61eecc3b..3e9d2052317 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -120,6 +120,8 @@ class base_setup_installer(osv.osv_memory):
                 continue
             if datas[mod] == 1:
                 modules_selected.append(mod)
+                if mod in ('account','sale','purchase'):
+                    modules_selected.append('account_voucher')
 
         module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
         for module in module_pool.browse(cr, uid, module_ids, context=context):
-- 
cgit v1.2.3


From 919eb500edc6f1bbf6af7dbc4bfa1e14cfde7e9f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Jun 2011 15:52:03 +0200
Subject: [IMP] base_setup: removed revision 4473. accout_voucher needs to be
 installed only when explicitly asked

bzr revid: qdp-launchpad@openerp.com-20110630135203-5mz8758186too7b0
---
 addons/base_setup/installer.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 3e9d2052317..172d9687582 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -53,7 +53,7 @@ class base_setup_installer(osv.osv_memory):
         'mrp':fields.boolean('Manufacturing',
             help="Helps you manage your manufacturing processes and generate "
                  "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing',
+        'account_voucher':fields.boolean('Invoicing & Payments',
             help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
         'account_accountant':fields.boolean('Accounting & Finance',
             help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
@@ -120,8 +120,6 @@ class base_setup_installer(osv.osv_memory):
                 continue
             if datas[mod] == 1:
                 modules_selected.append(mod)
-                if mod in ('account','sale','purchase'):
-                    modules_selected.append('account_voucher')
 
         module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
         for module in module_pool.browse(cr, uid, module_ids, context=context):
-- 
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')

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 1f5aa0643ffee36327151e8e2b30315c883e0cd5 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Wed, 6 Jul 2011 17:59:28 +0530
Subject: [IMP]: module is defined by its complexity

bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
---
 addons/base_setup/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 420deb46bfb..2d534917da3 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -24,6 +24,7 @@
     'name': 'Base Setup',
     'version': '1.0',
     'category': 'Tools',
+    'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
 ================================================================================
-- 
cgit v1.2.3


From d2c3678335c340e24d83ed354020df7495dcc34e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Jul 2011 15:38:43 +0200
Subject: [IMP] base_setup: avoid remultiple, useless restarts of osv pool

bzr revid: odo@openerp.com-20110712133843-15gxpmao4e62pn59
---
 addons/base_setup/installer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 172d9687582..381164e69d0 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -110,8 +110,6 @@ class base_setup_installer(osv.osv_memory):
 
 
     def execute(self, cr, uid, ids, context=None):
-        if context is None:
-             context = {}
         module_pool = self.pool.get('ir.module.module')
         modules_selected = []
         datas = self.read(cr, uid, ids, context=context)[0]
@@ -122,16 +120,19 @@ class base_setup_installer(osv.osv_memory):
                 modules_selected.append(mod)
 
         module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+        need_install = False
         for module in module_pool.browse(cr, uid, module_ids, context=context):
             if module.state == 'uninstalled':
                 module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+                need_install = True
                 cr.commit()
-                new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
             elif module.state == 'installed':
                 cr.execute("update ir_actions_todo set state='open' \
                                     from ir_model_data as data where data.res_id = ir_actions_todo.id \
                                     and ir_actions_todo.type='special'\
                                     and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+        if need_install:
+            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
         return
     
 base_setup_installer()
-- 
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')

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')

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')

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 7a2c4c59a7ac481618b411f9e5c65ca82483c0b3 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 27 Jul 2011 17:48:34 +0530
Subject: [IMP]base_setup: Label Name Improved in terminology

bzr revid: mma@tinyerp.com-20110727121834-o57c5bs8v7a4yhn9
---
 addons/base_setup/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 381164e69d0..16bf6cf5555 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory):
                                   ('Guest','Guest'),
                                   ('Tenant','Tenant')
                                   ],
-                                 'Choose how to call a customer', required=True ),
+                                 'Customer / Partner / Patient ?', required=True ),
     }
     _defaults={
                'partner' :'Partner',
-- 
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 +-
 addons/base_setup/installer.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup')

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>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 16bf6cf5555..fed316eb39e 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -262,7 +262,7 @@ class specify_partner_terminology(osv.osv_memory):
                                   ('Guest','Guest'),
                                   ('Tenant','Tenant')
                                   ],
-                                 'Customer / Partner / Patient ?', required=True ),
+                                 'Choose how to call a Customer', required=True ),
     }
     _defaults={
                'partner' :'Partner',
-- 
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')

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')

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')

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/__init__.py                      |  82 +-----
 addons/base_setup/__openerp__.py                   |  12 +-
 addons/base_setup/base_setup.py                    | 315 ++++++++++++++++++++
 addons/base_setup/base_setup_data.xml              |  46 ---
 addons/base_setup/base_setup_demo.xml              |   6 -
 addons/base_setup/base_setup_installer.xml         | 306 -------------------
 addons/base_setup/base_setup_views.xml             | 246 ++++++++++++++++
 addons/base_setup/installer.py                     | 324 ---------------------
 addons/base_setup/wizard/__init__.py               |  25 --
 addons/base_setup/wizard/res_company_logo.py       |  49 ----
 addons/base_setup/wizard/res_company_logo_view.xml |  48 ---
 11 files changed, 567 insertions(+), 892 deletions(-)
 create mode 100644 addons/base_setup/base_setup.py
 delete mode 100644 addons/base_setup/base_setup_data.xml
 delete mode 100644 addons/base_setup/base_setup_demo.xml
 delete mode 100644 addons/base_setup/base_setup_installer.xml
 create mode 100644 addons/base_setup/base_setup_views.xml
 delete mode 100644 addons/base_setup/installer.py
 delete mode 100644 addons/base_setup/wizard/__init__.py
 delete mode 100644 addons/base_setup/wizard/res_company_logo.py
 delete mode 100644 addons/base_setup/wizard/res_company_logo_view.xml

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 2dab90b90b2..82fe6ca3601 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,84 +19,6 @@
 #
 ##############################################################################
 
-import installer
-import wizard
-import os
-import base64
-import random
-import tools
-from osv import fields, osv
-import netsvc
-from tools.translate import _
-
-class base_setup_config_choice(osv.osv_memory):
-    """
-    """
-    _name = 'base.setup.config'
-    logger = netsvc.Logger()
-
-    def _get_image(self, cr, uid, context=None):
-        file_no = str(random.randint(1,3))
-        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
-
-    def get_users(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [])
-        user_list = []
-        user_tmpl_nopass = _('    - %s :\n\t\tLogin : %s')
-        user_tmpl_pass =   _('    - %s :\n\t\tLogin : %s \n\t\tPassword : %s')
-        for user in user_obj.browse(cr, uid, user_ids, context=context):
-            if user.password and not user.password.startswith('$'):
-                user_list.append(user_tmpl_pass % (user.name, user.login, user.password))
-            else:
-                user_list.append(user_tmpl_nopass % (user.name, user.login))
-        return _('The following users have been installed : \n')+ '\n'.join(user_list)
-
-    _columns = {
-        'installed_users':fields.text('Installed Users', readonly=True),
-        'config_logo' : fields.binary('Image', readonly=True),
-        }
-
-    _defaults = {
-        'installed_users':get_users,
-         'config_logo' : _get_image
-        }
-
-    def reset_menu(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        menu_id = user._get_menu()
-        user.write({'action_id': False,
-                    'menu_id': menu_id})
-        return self.pool.get('ir.actions.act_window').browse(cr, uid, menu_id, context=context)
-
-    def menu(self, cr, uid, ids, context=None):
-        menu = self.reset_menu(cr, uid, context=context)
-
-        if menu.view_id.id:
-            view_id = (menu.view_id.id, menu.view_id.name)
-        else:
-            view_id = False
-
-        return {
-            'name': menu.name,
-            'type': menu.type,
-            'view_id': view_id,
-            'domain': menu.domain,
-            'res_model': menu.res_model,
-            'src_model': menu.src_model,
-            'view_type': menu.view_type,
-            'view_mode': menu.view_mode,
-            'views': menu.views,
-        }
-
-    def config(self, cr, uid, ids, context=None):
-        self.reset_menu(cr, uid, context=context)
-        return self.pool.get('res.config').next(cr, uid, [], context=context)
-
-base_setup_config_choice()
-
+import base_setup
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 0c3385b4dab..c483b4324c1 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -29,19 +29,15 @@
 This module helps to configure the system at the installation of a new database.
 ================================================================================
 
-It allows you to choose the type of interface and select from a list of applications to install.
+Shows you a list of applications features to install from.
 
-It also helps to easily configure your company.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_setup_data.xml'],
-    'update_xml': ['security/ir.model.access.csv',
-                   'wizard/res_company_logo_view.xml',
-                   'base_setup_installer.xml',
-                   ],
-    'demo_xml': ['base_setup_demo.xml'],
+    'init_xml': [],
+    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ],
+    'demo_xml': [],
     'installable': True,
     'active': True,
     'certificate': '0086711085869',
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
new file mode 100644
index 00000000000..340c2f93044
--- /dev/null
+++ b/addons/base_setup/base_setup.py
@@ -0,0 +1,315 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import pytz
+
+import pooler
+import tools
+from osv import fields, osv
+from tools.translate import _
+
+#Application and feature chooser, this could be done by introspecting ir.modules
+
+class base_setup_installer(osv.osv_memory):
+    _name = 'base.setup.installer'
+    _inherit = 'res.config.installer'
+
+    _install_if = {
+        ('sale','crm'): ['sale_crm'],
+        ('sale','project'): ['project_mrp'],
+    }
+    _columns = {
+        # Generic modules
+        'crm':fields.boolean('Customer Relationship Management',
+            help="Helps you track and manage relations with customers such as"
+                 " leads, requests or issues. Can automatically send "
+                 "reminders, escalate requests or trigger business-specific "
+                 "actions based on standard events."),
+        'sale':fields.boolean('Sales Management',
+            help="Helps you handle your quotations, sale orders and invoicing"
+                 "."),
+        'project':fields.boolean('Project Management',
+            help="Helps you manage your projects and tasks by tracking them, "
+                 "generating plannings, etc..."),
+        'knowledge':fields.boolean('Knowledge Management',
+            help="Lets you install addons geared towards sharing knowledge "
+                 "with and between your employees."),
+        'stock':fields.boolean('Warehouse Management',
+            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
+        'mrp':fields.boolean('Manufacturing',
+            help="Helps you manage your manufacturing processes and generate "
+                 "reports on those processes."),
+        'account_voucher':fields.boolean('Invoicing & Payments',
+            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
+        'account_accountant':fields.boolean('Accounting & Finance',
+            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
+        'purchase':fields.boolean('Purchase Management',
+            help="Helps you manage your purchase-related processes such as "
+                 "requests for quotations, supplier invoices, etc..."),
+        'hr':fields.boolean('Human Resources',
+            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
+        'point_of_sale':fields.boolean('Point of Sales',
+            help="Helps you get the most out of your points of sales with "
+                 "fast sale encoding, simplified payment mode encoding, "
+                 "automatic picking lists generation and more."),
+        'marketing':fields.boolean('Marketing',
+            help="Helps you manage your marketing campaigns step by step."),
+        'profile_tools':fields.boolean('Extra Tools',
+            help="Lets you install various interesting but non-essential tools "
+                "like Survey, Lunch and Ideas box."),
+        'report_designer':fields.boolean('Advanced Reporting',
+            help="Lets you install various tools to simplify and enhance "
+                 "OpenERP's report creation."),
+        # Vertical modules
+        'product_expiry':fields.boolean('Food Industry',
+            help="Installs a preselected set of OpenERP applications "
+                "which will help you manage your industry."),
+        'association':fields.boolean('Associations',
+            help="Installs a preselected set of OpenERP "
+                 "applications which will help you manage your association "
+                 "more efficiently."),
+        'auction':fields.boolean('Auction Houses',
+            help="Installs a preselected set of OpenERP "
+                 "applications selected to help you manage your auctions "
+                 "as well as the business processes around them."),
+        }
+
+    def _if_knowledge(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['document_ftp']
+        return None
+
+    def _if_misc_tools(self, cr, uid, ids, context=None):
+        return ['profile_tools']
+
+    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
+        value = {}
+        # Calculate progress
+        closed, total = self.get_current_progress(cr, uid)
+        progress = round(100. * closed / (total + len(filter(None, args))))
+        value.update({'progress':progress})
+        if progress < 10.:
+            progress = 10.
+        
+        return {'value':value}
+
+
+    def execute(self, cr, uid, ids, context=None):
+        module_pool = self.pool.get('ir.module.module')
+        modules_selected = []
+        datas = self.read(cr, uid, ids, context=context)[0]
+        for mod in datas.keys():
+            if mod in ('id', 'progress'):
+                continue
+            if datas[mod] == 1:
+                modules_selected.append(mod)
+
+        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+        need_install = False
+        for module in module_pool.browse(cr, uid, module_ids, context=context):
+            if module.state == 'uninstalled':
+                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+                need_install = True
+                cr.commit()
+            elif module.state == 'installed':
+                cr.execute("update ir_actions_todo set state='open' \
+                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                                    and ir_actions_todo.type='special'\
+                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+        if need_install:
+            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+        return
+
+#Migrate data from another application Conf wiz
+
+class migrade_application_installer_modules(osv.osv_memory):
+    _name = 'migrade.application.installer.modules'
+    _inherit = 'res.config.installer'
+    _columns = {
+        'import_saleforce': fields.boolean('Import Saleforce',
+            help="For Import Saleforce"),
+        'import_sugarcrm': fields.boolean('Import Sugarcrm',
+            help="For Import Sugarcrm"),
+        'sync_google_contact': fields.boolean('Sync Google Contact',
+            help="For Sync Google Contact"),
+        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
+            help="For Quickbooks Ippids"),
+    }
+
+class product_installer(osv.osv_memory):
+    _name = 'product.installer'
+    _inherit = 'res.config'
+    _columns = {
+                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+
+    }
+    _defaults = {
+                 'customers': 'create',
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+             context = {}
+        data_obj = self.pool.get('ir.model.data')
+        val = self.browse(cr, uid, ids, context=context)[0]
+        if val.customers == 'create':
+            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            return {
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'res.partner',
+                    'views': [(id2, 'form')],
+                    'type': 'ir.actions.act_window',
+                    'target': 'current',
+                    'nodestroy':False,
+                }
+        if val.customers == 'import':
+            return {'type': 'ir.actions.act_window'}
+
+# Define users preferences for new users (ir.values)
+
+def _lang_get(self, cr, uid, context=None):
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [('translatable','=',True)])
+    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
+    res = [(r['code'], r['name']) for r in res]
+    return res
+
+def _tz_get(self,cr,uid, context=None):
+    return [(x, x) for x in pytz.all_timezones]
+
+class user_preferences_config(osv.osv_memory):
+    _name = 'user.preferences.config'
+    _inherit = 'res.config'
+    _columns = {
+        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
+            help="Set default for new user's timezone, used to perform timezone conversions "
+                 "between the server and the client."),
+        'context_lang': fields.selection(_lang_get, 'Language', required=True,
+            help="Sets default language for the all user interface, when UI "
+                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
+        'view': fields.selection([('simple','Simplified'),
+                                  ('extended','Extended')],
+                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
+                                 
+    }
+    _defaults={
+               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+               'context_lang' : 'en_US',
+               'menu_tips' : True
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
+        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
+        for id, field, value in res_default:
+            res.update({field: value})
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        user_ids = user_obj.search(cr, uid, [], context=context)
+        for o in self.browse(cr, uid, ids, context=context):
+            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
+            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
+            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
+            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
+        return {}
+
+# Specify Your Terminology
+
+class specify_partner_terminology(osv.osv_memory):
+    _name = 'base.setup.terminology'
+    _inherit = 'res.config'
+    _columns = {
+        'partner': fields.selection([('Customer','Customer'),
+                                  ('Client','Client'),
+                                  ('Member','Member'),
+                                  ('Patient','Patient'),
+                                  ('Partner','Partner'),
+                                  ('Donor','Donor'),
+                                  ('Guest','Guest'),
+                                  ('Tenant','Tenant')
+                                  ],
+                                 'Choose how to call a Customer', required=True ),
+    }
+    _defaults={
+               'partner' :'Partner',
+    }
+
+    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
+        trans_obj = self.pool.get('ir.translation')
+        user_obj = self.pool.get('res.users')
+        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
+        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
+        if existing_trans_ids:
+            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
+        else:
+            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
+        return {}
+
+    def execute(self, cr, uid, ids, context=None):
+        def _case_insensitive_replace(ref_string, src, value):
+            import re
+            pattern = re.compile(src, re.IGNORECASE)
+            return pattern.sub(_(value), _(ref_string))
+        trans_obj = self.pool.get('ir.translation')
+        fields_obj = self.pool.get('ir.model.fields')
+        menu_obj = self.pool.get('ir.ui.menu')
+        act_window_obj = self.pool.get('ir.actions.act_window')
+        for o in self.browse(cr, uid, ids, context=context):
+            #translate label of field
+            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
+            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
+                field_ref = f_id.model_id.model + ',' + f_id.name
+                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
+            #translate help tooltip of field
+            for obj in self.pool.obj_pool.values():
+                for field_name, field_rec in obj._columns.items():
+                    if field_rec.help.lower().count('customer'):
+                        field_ref = obj._name + ',' + field_name
+                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
+            #translate menuitems
+            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
+            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
+                menu_name = m_id.name
+                menu_ref = 'ir.ui.menu' + ',' + 'name'
+                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
+            #translate act window name
+            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'name'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
+            #translate act window tooltips
+            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
+            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
+                act_ref = 'ir.actions.act_window' + ',' + 'help'
+                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
+        return {}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
deleted file mode 100644
index 2c4f8f46323..00000000000
--- a/addons/base_setup/base_setup_data.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data noupdate="1">
-    <record id="view_base_setup" model="ir.ui.view">
-      <field name="name">Setup</field>
-      <field name="model">base.setup.config</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-      <form string="Information about your new database">
-        <group colspan="4" col="8">
-          <group colspan="3" width="220">
-            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
-            <newline/>
-            <label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
-          </group>
-          <separator string="" orientation="vertical" colspan="1" rowspan="8"/>
-          <group colspan="4" width="400">
-            <separator string="New Database" colspan="4"/>
-            <label align="0.0" string="Your database is now created." colspan="4"/>
-            <field name="installed_users" nolabel= "1" colspan="4"/>
-          </group>
-        </group>
-        <group colspan="8" col="8">
-          <separator string="" colspan="8"/>
-          <label string="" colspan="6"/>
-          <button name="menu" icon="gtk-ok" type="object" string="Skip Configuration Wizards" help="Only for experimented users" colspan="1"/>
-          <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
-        </group>
-    </form>
-   </field>
-  </record>
-
-    <record id="action_base_setup" model="ir.actions.act_window">
-      <field name="name">Setup</field>
-      <field name="res_model">base.setup.config</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="view_id" ref="view_base_setup"/>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base.user_root" model="res.users">
-      <field name="action_id" ref="action_base_setup"/>
-      <field name="menu_id" ref="action_base_setup"/>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
deleted file mode 100644
index 39f923a895b..00000000000
--- a/addons/base_setup/base_setup_demo.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>
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>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
new file mode 100644
index 00000000000..0e1efb40b32
--- /dev/null
+++ b/addons/base_setup/base_setup_views.xml
@@ -0,0 +1,246 @@
+<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" />
+            <field name="sale" />
+            <field name="project" />
+            <field name="knowledge" />
+            <field name="stock" />
+            <field name="mrp" />
+            <field name="account_voucher" />
+            <field name="account_accountant" />
+            <field name="purchase" />
+            <field name="hr" />
+            <field name="profile_tools" />
+            <field name="marketing" groups="base.group_extended" />
+            <field name="point_of_sale" groups="base.group_extended" />
+            <field name="report_designer" groups="base.group_extended" />
+            <separator string="Install Specific Industry Applications" colspan="4"/>
+            <field name="association" />
+            <field name="auction" />
+            <field name="product_expiry" />
+            <group name="crm"/> 
+            <group name="sale"/> 
+            <group name="project"/> 
+            <group name="knowledge"/> 
+            <group name="mrp"/> 
+            <group name="account_accountant"/>
+            <group name="purchase"/>
+            <group name="hr"/>
+            <group name="profile_tools"/>
+            <group name="marketing"/>
+            <group name="report_designer"/>
+            <group name="association"/>
+          </group>
+        </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>
+
+     <!-- 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>
+	<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">Set 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>
+      <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>
+
+      <!-- Create Additional Users  -->
+      <record id="action_config_access_other_user" model="ir.actions.act_window">
+          <field name="name">Create Additional 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>
+      <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>
+
+
+      <!--   Specify Your Terminology Config Wiz-->
+     <record id="base_setup_terminology_form" model="ir.ui.view">
+          <field name="name">Specify Your Terminology</field>
+          <field name="model">base.setup.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">Specify Your Terminology for Customers</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">base.setup.terminology</field>
+          <field name="view_type">form</field>
+          <field name="view_id" ref="base_setup_terminology_form"/>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+      </record>
+      <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>
+
+    <!-- Company config -->
+    <record id="action_base_setup_company" model="ir.actions.act_window">
+      <field name="name">Set Company Header and Footer</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>
+    <!--   register Upload Logo configuration wizard  -->
+    <record id="base_setup_company_logo_action" model="ir.actions.act_window">
+      <field name="name">Upload Your Company Logo</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">res.company</field>
+      <field name="view_id" ref="base.view_company_form"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="context">{'res_id': user.company_id.id}</field>
+    </record>
+    <record id="config_wizard_action_res_company_logo" model="ir.actions.todo">
+        <field name="action_id" ref="base_setup_company_logo_action"/>
+        <field name="category_id" ref="base.category_administration_config"/>
+        <field name="state">done</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
deleted file mode 100644
index fed316eb39e..00000000000
--- a/addons/base_setup/installer.py
+++ /dev/null
@@ -1,324 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-import pooler
-import pytz
-from tools.translate import _
-import tools
-
-class base_setup_installer(osv.osv_memory):
-    _name = 'base.setup.installer'
-    _inherit = 'res.config.installer'
-
-    _install_if = {
-        ('sale','crm'): ['sale_crm'],
-        ('sale','project'): ['project_mrp'],
-    }
-    _columns = {
-        # Generic modules
-        'crm':fields.boolean('Customer Relationship Management',
-            help="Helps you track and manage relations with customers such as"
-                 " leads, requests or issues. Can automatically send "
-                 "reminders, escalate requests or trigger business-specific "
-                 "actions based on standard events."),
-        'sale':fields.boolean('Sales Management',
-            help="Helps you handle your quotations, sale orders and invoicing"
-                 "."),
-        'project':fields.boolean('Project Management',
-            help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'knowledge':fields.boolean('Knowledge Management',
-            help="Lets you install addons geared towards sharing knowledge "
-                 "with and between your employees."),
-        'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
-        'mrp':fields.boolean('Manufacturing',
-            help="Helps you manage your manufacturing processes and generate "
-                 "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing & Payments',
-            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
-        'account_accountant':fields.boolean('Accounting & Finance',
-            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
-        'purchase':fields.boolean('Purchase Management',
-            help="Helps you manage your purchase-related processes such as "
-                 "requests for quotations, supplier invoices, etc..."),
-        'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
-        'point_of_sale':fields.boolean('Point of Sales',
-            help="Helps you get the most out of your points of sales with "
-                 "fast sale encoding, simplified payment mode encoding, "
-                 "automatic picking lists generation and more."),
-        'marketing':fields.boolean('Marketing',
-            help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Extra Tools',
-            help="Lets you install various interesting but non-essential tools "
-                "like Survey, Lunch and Ideas box."),
-        'report_designer':fields.boolean('Advanced Reporting',
-            help="Lets you install various tools to simplify and enhance "
-                 "OpenERP's report creation."),
-        # Vertical modules
-        'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry."),
-        'association':fields.boolean('Associations',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your association "
-                 "more efficiently."),
-        'auction':fields.boolean('Auction Houses',
-            help="Installs a preselected set of OpenERP "
-                 "applications selected to help you manage your auctions "
-                 "as well as the business processes around them."),
-        }
-
-    def _if_knowledge(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['document_ftp']
-        return None
-
-    def _if_misc_tools(self, cr, uid, ids, context=None):
-        return ['profile_tools']
-
-    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
-        value = {}
-        # Calculate progress
-        closed, total = self.get_current_progress(cr, uid)
-        progress = round(100. * closed / (total + len(filter(None, args))))
-        value.update({'progress':progress})
-        if progress < 10.:
-            progress = 10.
-        
-        return {'value':value}
-
-
-    def execute(self, cr, uid, ids, context=None):
-        module_pool = self.pool.get('ir.module.module')
-        modules_selected = []
-        datas = self.read(cr, uid, ids, context=context)[0]
-        for mod in datas.keys():
-            if mod in ('id', 'progress'):
-                continue
-            if datas[mod] == 1:
-                modules_selected.append(mod)
-
-        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-        need_install = False
-        for module in module_pool.browse(cr, uid, module_ids, context=context):
-            if module.state == 'uninstalled':
-                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                need_install = True
-                cr.commit()
-            elif module.state == 'installed':
-                cr.execute("update ir_actions_todo set state='open' \
-                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
-                                    and ir_actions_todo.type='special'\
-                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-        if need_install:
-            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-        return
-    
-base_setup_installer()
-
-#Migrate data from another application Conf wiz
-
-class migrade_application_installer_modules(osv.osv_memory):
-    _name = 'migrade.application.installer.modules'
-    _inherit = 'res.config.installer'
-    _columns = {
-        'import_saleforce': fields.boolean('Import Saleforce',
-            help="For Import Saleforce"),
-        'import_sugarcrm': fields.boolean('Import Sugarcrm',
-            help="For Import Sugarcrm"),
-        'sync_google_contact': fields.boolean('Sync Google Contact',
-            help="For Sync Google Contact"),
-        'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
-            help="For Quickbooks Ippids"),
-    }
-    
-migrade_application_installer_modules()
-
-class product_installer(osv.osv_memory):
-    _name = 'product.installer'
-    _inherit = 'res.config'
-    _columns = {
-                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
-
-    }
-    _defaults = {
-                 'customers': 'create',
-    }
-    
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-             context = {}
-        data_obj = self.pool.get('ir.model.data')
-        val = self.browse(cr, uid, ids, context=context)[0]
-        if val.customers == 'create':
-            id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            return {
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'res.partner',
-                    'views': [(id2, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'current',
-                    'nodestroy':False,
-                }
-        if val.customers == 'import':
-            return {'type': 'ir.actions.act_window'}
-
-product_installer()
-
-
-#       Define default users preferences config wiz
-
-def _lang_get(self, cr, uid, context=None):
-    obj = self.pool.get('res.lang')
-    ids = obj.search(cr, uid, [('translatable','=',True)])
-    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
-    res = [(r['code'], r['name']) for r in res]
-    return res
-
-def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
-
-class user_preferences_config(osv.osv_memory):
-    _name = 'user.preferences.config'
-    _inherit = 'res.config'
-    _columns = {
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="Set default for new user's timezone, used to perform timezone conversions "
-                 "between the server and the client."),
-        'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets default language for the all user interface, when UI "
-                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
-        'view': fields.selection([('simple','Simplified'),
-                                  ('extended','Extended')],
-                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
-        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
-                                 
-    }
-    _defaults={
-               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
-               'context_lang' : 'en_US',
-               'menu_tips' : True
-    }
-    
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
-        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
-        for id, field, value in res_default:
-            res.update({field: value})
-        return res
-
-    def execute(self, cr, uid, ids, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [], context=context)
-        for o in self.browse(cr, uid, ids, context=context):
-            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
-            ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
-            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
-            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
-            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
-        return {}
-
-user_preferences_config()
-
-# Specify Your Terminology
-
-class specify_partner_terminology(osv.osv_memory):
-    _name = 'specify.partner.terminology'
-    _inherit = 'res.config'
-    _columns = {
-        'partner': fields.selection([('Customer','Customer'),
-                                  ('Client','Client'),
-                                  ('Member','Member'),
-                                  ('Patient','Patient'),
-                                  ('Partner','Partner'),
-                                  ('Donor','Donor'),
-                                  ('Guest','Guest'),
-                                  ('Tenant','Tenant')
-                                  ],
-                                 'Choose how to call a Customer', required=True ),
-    }
-    _defaults={
-               'partner' :'Partner',
-    }
-    
-    def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
-        trans_obj = self.pool.get('ir.translation')
-        user_obj = self.pool.get('res.users')
-        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
-        existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
-        if existing_trans_ids:
-            trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
-        else:
-            create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
-        return {}
-    
-    def execute(self, cr, uid, ids, context=None):
-        def _case_insensitive_replace(ref_string, src, value):
-            import re
-            pattern = re.compile(src, re.IGNORECASE)
-            return pattern.sub(_(value), _(ref_string))
-        trans_obj = self.pool.get('ir.translation')
-        fields_obj = self.pool.get('ir.model.fields')
-        menu_obj = self.pool.get('ir.ui.menu')
-        act_window_obj = self.pool.get('ir.actions.act_window')
-        for o in self.browse(cr, uid, ids, context=context):
-            #translate label of field
-            field_ids = fields_obj.search(cr, uid, [('field_description','ilike','Customer')])
-            for f_id in fields_obj.browse(cr ,uid, field_ids, context=context):
-                field_ref = f_id.model_id.model + ',' + f_id.name
-                self.make_translations(cr, uid, ids, field_ref, 'field', f_id.field_description, _case_insensitive_replace(f_id.field_description,'Customer',o.partner), context=context)
-            #translate help tooltip of field
-            for obj in self.pool.obj_pool.values():
-                for field_name, field_rec in obj._columns.items():
-                    if field_rec.help.lower().count('customer'):
-                        field_ref = obj._name + ',' + field_name
-                        self.make_translations(cr, uid, ids, field_ref, 'help', field_rec.help, _case_insensitive_replace(field_rec.help,'Customer',o.partner), context=context)
-            #translate menuitems
-            menu_ids = menu_obj.search(cr,uid, [('name','ilike','Customer')])
-            for m_id in menu_obj.browse(cr, uid, menu_ids, context=context):
-                menu_name = m_id.name
-                menu_ref = 'ir.ui.menu' + ',' + 'name'
-                self.make_translations(cr, uid, ids, menu_ref, 'model', menu_name, _case_insensitive_replace(menu_name,'Customer',o.partner), res_id=m_id.id, context=context)
-            #translate act window name
-            act_window_ids = act_window_obj.search(cr, uid, [('name','ilike','Customer')])
-            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
-                act_ref = 'ir.actions.act_window' + ',' + 'name'
-                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.name, _case_insensitive_replace(act_id.name,'Customer',o.partner), res_id=act_id.id, context=context)
-            #translate act window tooltips
-            act_window_ids = act_window_obj.search(cr, uid, [('help','ilike','Customer')])
-            for act_id in act_window_obj.browse(cr ,uid, act_window_ids, context=context):
-                act_ref = 'ir.actions.act_window' + ',' + 'help'
-                self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
-        return {}
-    
-specify_partner_terminology()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/wizard/__init__.py b/addons/base_setup/wizard/__init__.py
deleted file mode 100644
index 3c482efa976..00000000000
--- a/addons/base_setup/wizard/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import res_company_logo
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/wizard/res_company_logo.py b/addons/base_setup/wizard/res_company_logo.py
deleted file mode 100644
index 255b0e89408..00000000000
--- a/addons/base_setup/wizard/res_company_logo.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import os
-import tools
-from tools.translate import _
-
-
-class res_company_logo(osv.osv_memory):
-    _name = 'res.company.logo'
-    _inherit = 'res.config'
-    _columns = {
-        'logo' : fields.binary('Logo'),
-    }
-    _defaults={
-               'logo':lambda self,cr,uid,c: self.pool.get('res.company').browse(cr, uid, uid,c).logo,
-     }
-
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        user_comp = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        get_val = self.browse(cr, uid, ids)[0]
-        user_comp.write({'logo': get_val.logo}, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-    
-res_company_logo()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_setup/wizard/res_company_logo_view.xml b/addons/base_setup/wizard/res_company_logo_view.xml
deleted file mode 100644
index a21fd261dd8..00000000000
--- a/addons/base_setup/wizard/res_company_logo_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <record id="view_res_company_logo" model="ir.ui.view">
-            <field name="name">res.company.logo.form</field>
-            <field name="model">res.company.logo</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">Upload Your Company Logo</attribute>
-                </form>
-                <xpath expr='//separator[@string="title"]' position='attributes'>
-                   <attribute name='string'> </attribute>
-                </xpath>
-                <xpath expr="//label[@string='description']"
-                      position="attributes">
-                      <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
-                </xpath>
-                <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                     <attribute name='string'> </attribute>
-                     <attribute name='rowspan'>12</attribute>
-                 </xpath>
-                 <xpath expr="//button[@string='Next']" position="replace">
-                      <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
-                  </xpath>
-                 <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
-                  </group>
-                </group>
-             </data>
-            </field>
-        </record>
-
-        <record id="action_res_company_logo" model="ir.actions.act_window">
-            <field name="name">Upload Your Company Logo</field>
-            <field name="res_model">res.company.logo</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_res_company_logo"/>
-            <field name="target">new</field>
-        </record>
-        
-    </data>
-</openerp>
-- 
cgit v1.2.3


From 752df5acbdc1507ba7ff942fc5851fd86383e445 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 6 Sep 2011 04:40:18 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
---
 addons/base_setup/i18n/ar.po       |   6 +-
 addons/base_setup/i18n/bg.po       |   6 +-
 addons/base_setup/i18n/bs.po       |   6 +-
 addons/base_setup/i18n/ca.po       | 148 +++++++++++++++++++++++++-----------
 addons/base_setup/i18n/cs.po       | 150 ++++++++++++++++++++++++-------------
 addons/base_setup/i18n/da.po       |   6 +-
 addons/base_setup/i18n/de.po       |  27 +------
 addons/base_setup/i18n/el.po       |  12 +--
 addons/base_setup/i18n/es.po       |  27 +------
 addons/base_setup/i18n/es_AR.po    |   6 +-
 addons/base_setup/i18n/es_CL.po    |  27 +------
 addons/base_setup/i18n/es_EC.po    |   6 +-
 addons/base_setup/i18n/es_PY.po    |   6 +-
 addons/base_setup/i18n/et.po       |   6 +-
 addons/base_setup/i18n/fa.po       |   6 +-
 addons/base_setup/i18n/fi.po       | 122 +++++++++++++++++++-----------
 addons/base_setup/i18n/fr.po       |  20 +----
 addons/base_setup/i18n/gl.po       |   6 +-
 addons/base_setup/i18n/hr.po       |   6 +-
 addons/base_setup/i18n/hu.po       |  80 ++------------------
 addons/base_setup/i18n/id.po       |  22 +++---
 addons/base_setup/i18n/it.po       |  27 +------
 addons/base_setup/i18n/ko.po       |   6 +-
 addons/base_setup/i18n/lt.po       |   6 +-
 addons/base_setup/i18n/lv.po       |   6 +-
 addons/base_setup/i18n/mn.po       |  27 +------
 addons/base_setup/i18n/nb.po       |   6 +-
 addons/base_setup/i18n/nl.po       |  26 +------
 addons/base_setup/i18n/nl_BE.po    | 126 +++++++++++++++++++------------
 addons/base_setup/i18n/pl.po       |   6 +-
 addons/base_setup/i18n/pt.po       |   6 +-
 addons/base_setup/i18n/pt_BR.po    |  26 +------
 addons/base_setup/i18n/ro.po       |  27 +------
 addons/base_setup/i18n/ru.po       |  18 +----
 addons/base_setup/i18n/sk.po       |   6 +-
 addons/base_setup/i18n/sl.po       |   6 +-
 addons/base_setup/i18n/sq.po       |   6 +-
 addons/base_setup/i18n/sr.po       |  17 +----
 addons/base_setup/i18n/sr@latin.po |  17 +----
 addons/base_setup/i18n/sv.po       |  41 ++++------
 addons/base_setup/i18n/th.po       |   6 +-
 addons/base_setup/i18n/tlh.po      |   6 +-
 addons/base_setup/i18n/tr.po       |   8 +-
 addons/base_setup/i18n/uk.po       |   6 +-
 addons/base_setup/i18n/vi.po       |  24 ++----
 addons/base_setup/i18n/zh_CN.po    | 103 ++++++++++++-------------
 addons/base_setup/i18n/zh_TW.po    |   6 +-
 47 files changed, 569 insertions(+), 697 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index a2d59e2876e..50d19ac48f5 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 2e8d6b321d5..fced483ccb8 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "препоръчваме да инсталирате само фактуриране "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Следните потребители са инсталирани: \n"
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 64d08bb16d8..dd6d6149a62 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 9b56268acb7..06e4334b8cd 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -30,12 +30,12 @@ msgstr "Instal·la"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humans"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -45,12 +45,12 @@ msgstr "Correu electrònic"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Núm. compte bancari"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Eines extres"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -63,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"L'ajuda a gestionar els seus processos de fabricació i generar informes "
+"sobre aquests processos."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "L'ajuda a gestionar les seves campanyes de màrqueting pas a pas."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "La seva base de dades ja està creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "Terminal punt de venda"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Associacions"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -90,18 +92,20 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"L'ajuda a gestionar les seves necessitats comptables. Si no és comptable, li "
+"suggerim instal·lar només la facturació. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Els següents usuaris han estat instal·lats : \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -117,22 +121,22 @@ msgstr "Moneda"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Província"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Màrqueting"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Gestió de vendes"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -140,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Permet instal·lar diverses eines interessants però no essencials com a "
+"Informes, menjars i caixa d'Idees."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -147,11 +153,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Podeu començar configurant el sistema o connectant directament a la base de "
+"dades com un administrador."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Informes avançats"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -161,7 +169,7 @@ msgstr "Telèfon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_continguts"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -169,16 +177,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"La informació de la seva companyia s'utilitzarà per personalitzar els "
+"documents expedits amb OpenERP, com les factures, comandes i molt més."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Gestió del coneixement"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -198,6 +208,21 @@ msgid ""
 "    footer, the account chart to install and the language.\n"
 "    "
 msgstr ""
+"\n"
+"    Aquest mòdul implementa un sistema de configuració que ajuda a l'usuari\n"
+"    a configurar el sistema durant la instal·lació d'una nova base de "
+"dades.\n"
+"\n"
+"    Li permet seleccionar entre una llista de perfils a instal·lar:\n"
+"    * Perfil mínim\n"
+"    * Només comptabilitat\n"
+"    * Companyies de serveis\n"
+"    * Companyies de fabricació\n"
+"\n"
+"    També proporciona pantalles per ajudar-vos a configurar fàcilment la "
+"seva companyia, la capçalera i \n"
+"    el peu de pàgina, el pla comptable a instal·lar i l'idioma.\n"
+"    "
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -205,6 +230,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP que poden ajudar-"
+"vos a gestionar la seva indústria."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -212,6 +239,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Li ajuda a gestionar els seus projectes i tasques realitzant un seguiment "
+"dels mateixos, generant planificacions, ..."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -221,7 +250,7 @@ msgstr "Nom de la companyia"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Omet assistents de configuració"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -229,6 +258,9 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Li ajuda a gestionar els seus recursos humans mitjançant la codificació de "
+"l'estructura de treballadors, la generació de fulls de treball, seguiment de "
+"l'assistència, ..."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -236,11 +268,13 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Li permet crear les seves factures i controlar els pagaments. És una versió "
+"més fàcil del mòdul de comptabilitat per a gestors que no siguin comptables."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.companyia"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -248,6 +282,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Li ajuda a gestionar els seus processos relacionats amb les compres com "
+"peticions de pressupostos, factures de proveïdor, ..."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -263,12 +299,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Carrer 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.instal·lador"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -283,17 +319,17 @@ msgstr "Instal·lació"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Comptabilitat i finances"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Cases de subhastes"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Codi postal"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -306,6 +342,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Li permet instal·lar addons orientats a compartir el coneixement amb i entre "
+"els seus treballadors."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -313,12 +351,15 @@ msgid ""
 "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."
 msgstr ""
+"Escolliu les aplicacions que desitgeu cobrir amb el seus sistema. Si no "
+"esteu segurs sobre les seves necessitats exactes en aquest punt, podeu "
+"instal·lar-les fàcilment més tard."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Configuració de la compañía"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -332,41 +373,45 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Li ajuda a treure profit dels seus terminals punt de venda amb la "
+"codificació ràpida de les vendes, codificació de maneres de pagament "
+"simplificada, generació automàtica d'albarans, ..."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Gestió de compres"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
 msgstr ""
+"Li ajuda a gestionar els seus pressupostos, comandes de venda i facturació."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Gestió de magatzems"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Gestió de projectes"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Usuaris instal·lats"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nova base de dades"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Gestió de les relacions amb el client (CRM)"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -374,6 +419,9 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP per ajudar-vos a "
+"gestionar les seves subhastes com també els processos de negoci al voltant "
+"d'elles."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -392,6 +440,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Li permet instal·lar diverses eines per simplificar i millorar la creació "
+"d'informes en OpenERP."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -401,24 +451,24 @@ msgstr "Capçalera dels informes"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informació sobre la seva nova base de dades"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Indústria alimentària"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Producció"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -440,12 +490,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Pàgina web de la companyia"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Instal·la aplicacions específiques per a la indústria"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -455,18 +505,18 @@ msgstr "Carrer"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Configura la informació de la seva companyia"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Exemple: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Instal·la aplicacions"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -475,6 +525,10 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"L'ajuda a controlar i administrar les relacions amb els clients, tals com "
+"les iniciatives, peticions o qüestions. Podeu enviar automàticament "
+"recordatoris, escalar les peticions o activar accions específiques del "
+"negoci basat en esdeveniments estàndard."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -482,6 +536,8 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Li ajuda a gestionar el seu inventari i les operacions principals d'estoc: "
+"les ordres de lliurament, recepcions, ..."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -494,11 +550,13 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Instal·la un conjunt preseleccionat d'aplicacions en OpenERP que li ajudarà "
+"a administrar la seva associació de manera més eficient."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
 
 #~ msgid "Select a Profile"
 #~ msgstr "Seleccioneu un perfil"
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 8d7140bf5fd..f2410d6f046 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* base_setup
+# * base_setup
 #
 msgid ""
 msgstr ""
@@ -13,8 +13,9 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+"X-Poedit-Language: Czech\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -29,12 +30,12 @@ msgstr "Instalovat"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturace"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Lidské zdroje"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,17 +45,17 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Číslo bankovního účtu"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Další nástroje"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr "Patička výpisu 1"
+msgstr "Zápatí výpisu 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -62,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Pomůže vám spravovat vaše výrobní procesy a generovat výkazy nad těmito "
+"procesy."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Pomáhá vámkrok za krokem spravovat vaše marketingové kampaně."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Vaše databáze je nyní vytvořena."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "Prodejní místo"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Přidružení"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -89,23 +92,25 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Pomůže vám zvládnout vaše účetní potřeby. Pokud nejste účetní, doporučujeme "
+"vám instalovat pouze Fakturaci. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Byli instalováni následující uživatelů : \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Průběh nastavení"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "Patička výpisu 2"
+msgstr "Zápatí výpisu 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
@@ -116,22 +121,22 @@ msgstr "Měna"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Fed. stát"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Společnost"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Řízení prodeje"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -139,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Umožní vám instalovat různé zajímavé, ale ne nutně potřebné nástroje jako "
+"Průzkumy, Obědy a Krabice nápadů."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -146,11 +153,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Můžete začít s nastavením systému nebo se přímo připojit k databázi jako "
+"správce."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Pokročilé vykazování"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -160,7 +169,7 @@ msgstr "Telefon"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -168,16 +177,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Vaše informace o společnosti budou použity pro přizpůsobení dokumentů "
+"vytvářených OpenERP jako faktury, prodejní objednávky a mnoho dalších."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "název"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Správa znalostí"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -204,6 +215,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Instalovat předvybranou sadu aplikací OpenERP, která vám pomůže spravovat "
+"vaše odvětví."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -211,6 +224,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Pomůže vám spravovat projekty a úkoly jejich sledováním, generováním plánů, "
+"aj."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -220,7 +235,7 @@ msgstr "Název společnosti"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Přeskočit průvodce nastavení"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -228,6 +243,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Pomůže vám spravovat vaše lidské zdroje pomocí nakódování struktury "
+"zaměstnanců, generování pracovních listů, sledování docházky a další."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -235,11 +252,13 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Umožní vám vytvořit faktury a sledovat platby. Jedná se o jednodušší "
+"variantu účetního modulu pro vedoucí, kteří nejsou účetními."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -247,6 +266,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Pomůže vám spravovat vaše nákupní procesy jako požadavky na ocenění, faktury "
+"dodavatelů, aj."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -255,16 +276,19 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Tato věta se objeví dole ve vašich výkazech.\n"
+"Doporučujeme vám dát zde bankovní informace:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Ulice 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -279,17 +303,17 @@ msgstr "Nastavení"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Účetnictví & peněžnictví"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Aukční domy"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "PSČ"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -302,6 +326,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Umožní vám instalovat doplňky zaměřené na sdílení znalostí s a mezi vašimi "
+"zaměstnanci."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -309,12 +335,15 @@ msgid ""
 "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."
 msgstr ""
+"Vyberte aplikace, které chcete, aby zahrnoval váš systém. Můžete je "
+"instalovat snadno později, pokud si nejste v této fázi jisti svými přesnými "
+"požadavky."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Nastavení společnosti"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -328,41 +357,45 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Pomůže vám s většinou vašich prodejních míst díky rychlému kódování prodeje, "
+"zjednodušenému kódování režimu plateb, automatickému generování naváděcích "
+"seznamu a další."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Řízení nákupu"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
 msgstr ""
+"Pomáhá vám spravovat vaše cenové nabídky, prodejní příkazy a fakturaci."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Správa skladů"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektové řízení"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Instalováni uživatelé"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nová databáze"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Řízení vztahů se zákazníky"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -370,6 +403,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Instaluje předvybranou sadu aplikací OpenERP, která je vybraná, aby vám "
+"pomohla spravovat vaše aukce stejně tak jako obchodní procesy kolem."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -378,6 +413,9 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Tato věta se objeví v pravém horním roku vašich výkazů.\n"
+"Doporučujeme vám umístit zde slogan:\n"
+"\"Otevřené obchodní řešení\"."
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
@@ -385,38 +423,40 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Umožní vám instalovat rozličné nástroje ke zjednodušení a vylepšení "
+"vytváření výkazů OpenERP."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr "Hlavička výpisu"
+msgstr "Záhlaví výpisu"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informace o vaší nové databázi"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obrázek"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Potravinářský průmysl"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Výroba"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaše logo - Použijte velikost 450x150 obrazových bodů."
+msgstr "Vaše logo - Použijte velikost okolo 450x150 obrazových bodů."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -425,16 +465,19 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Tato věta se objeví na spodu vašich výkazů.\n"
+"Navrhujeme vám napsat zde právní věty:\n"
+"Web: http://openerp.com - Fax: +420 123456789 - Bankovní účet: 123456789/1234"
 
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Stránky společnosti"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Instalovat určité průmyslové aplikace"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -444,18 +487,18 @@ msgstr "Ulice"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Nastavit informace vaší společnosti"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Příklad: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Instalovat aplikace"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -464,6 +507,9 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Pomůže vám sledovat a spravovat vztahy se zákazníky jako vedení, požadavky "
+"nebo problémy. Může automaticky zasílat upozornění, stupňování požadavků "
+"nebo vyvolat obchodně vztažené akce založené na standardních událostech."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -471,11 +517,13 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Pomůže vám spravovat váš inventář a hlavní skladové operace: doručovací "
+"příkazy, příjmy, aj."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Základní nastavení"
 
 #. module: base_setup
 #: help:base.setup.installer,association:0
@@ -483,6 +531,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Instalovat předvybranou sadu aplikací OpenERP, které vám pomůžou spravovat "
+"efektivněji vaše asociace."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index f93d2fd83e5..0920734dcdf 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Følgende brugere er installeret \n"
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 27c093cf732..7b7c8752ee0 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "Buchhaltung. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Folgende Benutzer wurden installiert : \n"
@@ -623,26 +623,5 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Vorherig"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
 #~ msgid "Use Directly"
 #~ msgstr "Sofort beginnen"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index e2ebf50c8c5..4ec315dfab0 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n"
@@ -626,9 +626,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Cancel"
 #~ msgstr "Άκυρο"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα του Αντικειμένου(Object) θα πρέπει να ξεκινά με x_ και δεν θα "
-#~ "πρέπει να περιέχει ειδικούς χαρακτήρες."
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 204b13b59a9..b41004e6a10 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -627,24 +627,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Define Main Company"
 #~ msgstr "Defina la compañia principal"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 351d8a5943f..653f62b30ed 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index bd400464b49..b2d73697791 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -627,24 +627,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Define Main Company"
 #~ msgstr "Defina la compañia principal"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML no válido para la estructura de la vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "¡El ID del certificado del módulo debe ser único!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "¡El nombre del módulo debe ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 378e64b4566..0a596dd129a 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 7918e3a5def..968e419753d 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 3f71facf680..dfa1b770fb7 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 8ebc657c05a..4d95fd89d4e 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 0e0d22e42dc..b9aed25bd1a 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -30,12 +30,12 @@ msgstr "Asenna"
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Laskutus"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Henkilöstön hallinta"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -45,12 +45,12 @@ msgstr "Sähköposti"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Pankkitilin numero"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Lisätyökalut"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -63,26 +63,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Auttaa sinua hallitsemaan valmistusprosessia ja luomaan raportteja näistä "
+"prosesseista."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Auttaa sinua hallitsemaan markkinointikampanjoita vaihe vaiheelta."
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Tietokantasi on nyt luotu."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "Myyntipiste"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Assosiaatiot"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -90,18 +92,20 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Auttaa sinua hoitamaan kirjanpidolliset tarpeet, jos et ole kirjanpitäjä, "
+"suosittelemme että asennat vain laskutuksen "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Seuraavat käyttäjät on asennettu: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguraation eteneminen"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -117,22 +121,22 @@ msgstr "Valuutta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Osavaltio"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Markkinointi"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Myynninhallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -140,6 +144,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Antaa sinun asentaa monia kiinnostavia mutta ei välttämättömiä työkaluja "
+"kuten kysely, lounas, idealaatikko."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -147,11 +153,12 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Voit aloittaa järjestelmän konfiguroinnin suoraan tietokantaan pääkäyttäjänä."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Kehittynyt raportointi"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -169,16 +176,18 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Yritystietojasi käytetään personoimaan OpenERP dokumenttejä kuten laskuja, "
+"myyntitilauksia yms."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "otsikko"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Osaamisenhallinta"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -205,6 +214,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Asentaa esivalitun sarjan OpenERP ohjelmia, joka auttaa sinua hallitsemaan "
+"teollisuudenalaasi."
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -212,6 +223,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, "
+"luomalla suunnitelmia yms."
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -221,7 +234,7 @@ msgstr "Yrityksen nimi"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Ohita asetusvelhot"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -229,6 +242,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Auttaa sinua hallitsemaan henkilöstöresurssejasi määrittelemällä "
+"henkilöstörakenteen, luomalla työlistat, seuraamalla läsnäoloa jne."
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -236,6 +251,8 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Mahdollistaa laskujen laadinnan ja maksujen seurannan. On helpompi versio "
+"kirjanpitomoduulista päälliköille jotka eivät ole kirjanpitäjiä."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
@@ -248,6 +265,8 @@ msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
 msgstr ""
+"Auttaa sinua hallitsemaan ostoon liittyviä prosesseja kuten esim. "
+"tarjouspyyntöjä, toimittajien laskuja yms."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -263,7 +282,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Katuosoite 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -283,17 +302,17 @@ msgstr "Asetukset"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Kirjanpito ja talous"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Huutokauppatalot"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postinumero"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -306,6 +325,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Mahdollistaa lisäosien asentamisen, näiden tarkoituksena on tiedonjako "
+"henkilöstön kanssa ja henkilöstön kesken."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -313,12 +334,14 @@ msgid ""
 "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."
 msgstr ""
+"Valitse ohjelmat jotka haluat kuuluvan järjestelmääsi. Jos et ole varma "
+"tarpeistasi vielä, voit lisätä niitä helposti myöhemminkin."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Yrityksen konfigurointi"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -332,41 +355,44 @@ msgid ""
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
 msgstr ""
+"Auttaa sinua saamaan mahdollisimman paljon tulosta myyntipisteestäsi "
+"käyttäen nopeaa myynnin kirjausta, yksinkertaistettua maksunkoodausta, "
+"automaattista keräilylistan luontia jne."
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Ostojen hallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Auttaa sinua hallitsemaan tarjouksia, myyntitilauksia ja laskuja"
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Varastonhallinta"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projektinhallinta"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Asennetut käyttäjät"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Uusi tietokanta"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Asiakkuuden hallinta"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -374,6 +400,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
 msgstr ""
+"Asentaa esivalitun ryhmän OpenERP ohjelmia auttaakseen hallitsemaan "
+"huutokauppojasi ja niihin liittyviä bisnes prosesseja."
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -392,6 +420,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Mahdollistaa lisätyökalujen asentamiksen OpenERP raporttien luomisen "
+"helpottamiseksi."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -401,24 +431,24 @@ msgstr "Raportin ylätunniste"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Tietoja uudesta tietokannastasi"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Kuva"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Ruokateollisuus"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Valmistava"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -439,12 +469,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Yrityksen nettisivut"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Asenna tietyn toimialan ohjelmistot"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -454,18 +484,18 @@ msgstr "Katuosoite"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Määrittele yrityksesi tiedot"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "esim. http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Asenna ohjelmat"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -474,6 +504,10 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Hauttaa sinua seuraamaan ja hallitsemaan asiakaskontakteja kuten tarpeita, "
+"pyyntöjä ja tapauksia. Voi lähettää automaattisesti muistututksia, "
+"eskalointipyyntöjä tai käynnistää yrityskohtaisia toimintoja "
+"vakiotapahtumien pohjalta."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
@@ -481,6 +515,8 @@ msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
 msgstr ""
+"Auttaa sinua hallitsemaan varastoa ja varaston päätoimenpiteitä, "
+"toimitusmääräyksiä, vastaanottoja yms."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -493,6 +529,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Asentaa perussarjan OpenERP ohjelmia jotka auttavat sinua hallitsemaan "
+"yhdistystäsi tehokkaammin."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 31b8f853cb2..bdca9f51f13 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-01-18 16:45+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "vous suggérons d'installer uniquement la facturation. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Les utilisateurs suivants ont été installés : \n"
@@ -625,15 +625,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Précédent"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de caractère "
-#~ "spécial !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de modèle incorrect dans la définition de l'action"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML incorrect dans l'architecture de la vue !"
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index e6af0f12d0e..47e17d9a461 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 2c24027fbe9..055dfc0b6b2 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 "Language: hr\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 9f5178dce3a..76c4dfbe5e5 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2011-02-02 16:23+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +96,7 @@ msgstr ""
 "a Számlázást telepítse. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "A következő felhasználók lettek létrehozva : \n"
@@ -554,74 +555,3 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Az objektum nevének x_ -sal kell kezdődnie és nem tartalmazhat speciális "
-#~ "karaktereket"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Érvénytelen modell név a művelet meghatározásában."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "A modul tanúsítvány ID-jének egyedinek kell lennie !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "A modul névnek egyedinek kell lennie !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Érvénytelen XML a nézet architektúrában!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "A mező mérete soha nem lehet kevesebb, mint 1 !"
-
-#~ msgid ""
-#~ "The following users have been installed : \n"
-#~ "\"\n"
-#~ "\""
-#~ msgstr ""
-#~ "A következő felhasználók lettek telepítve : \n"
-#~ "\"\n"
-#~ "\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to put bank information here:\n"
-#~ "\"\n"
-#~ "\"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentések alján.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy a banki információk jelenlenek meg itt:\n"
-#~ "\"\n"
-#~ "\"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to put a slogan here:\n"
-#~ "\"\n"
-#~ "\"\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentés jobb felső sarkában.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy adja meg szlogenjét itt:\n"
-#~ "\"\n"
-#~ "\"\"Nyílt Forráskódú Üzleti Megoldás.\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "\"\n"
-#~ "\"We suggest you to write legal sentences here:\n"
-#~ "\"\n"
-#~ "\"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-"
-#~ "07"
-#~ msgstr ""
-#~ "Ez a mondat jelenik meg a jelentések alján.\n"
-#~ "\"\n"
-#~ "\"Javasoljuk, hogy írjon ide hivatalos mondatot:\n"
-#~ "\"\n"
-#~ "\"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-"
-#~ "07"
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 347a20b486a..dca87177171 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -24,17 +24,17 @@ msgstr "Kota"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install"
-msgstr "Pasang"
+msgstr "Instal"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Penagihan"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Sumber Daya Manusia"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,17 +44,17 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "No Rekening Bank"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Tools Extra"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Judul Bawah 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -62,11 +62,13 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Membantu Anda dalam mengelola proses produksi sekaligus menghasilkan "
+"berbagai laporan atas berbagai proses tersebut."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Untuk memandu Anda langkah demi langkah dalam kampanye pemasaran."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -91,7 +93,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 49a6338c933..55a31606ebb 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "di installare solo la fatturazione "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "I seguenti utenti sono stati installati: \n"
@@ -626,24 +626,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Indietro"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modello non valida nella definizione dell'azione"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
-#~ "caratteri speciali!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID certificato del modulo deve essere unico!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index d51d05a6a4d..c44968ee87f 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 269c1a98c66..3407608a532 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 052fc512eaf..e7155c45cf4 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 2d12f5b1288..bf92d17d7d3 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -94,7 +94,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n"
@@ -571,26 +571,5 @@ msgstr "base.setup.config"
 #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
 #~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
 
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Модулийн сертификат ID давхцах ёсгүй !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Модулийн нэр давхцах ёсгүй !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн архитектур алдаатай!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Талбарын хэмжээ 1-с бага байж болохгүй !"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
 #~ msgid "Use Directly"
 #~ msgstr "Хэрэглэх заавар"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index c94fa94f2c0..536317b07b5 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -97,7 +97,7 @@ msgstr ""
 "regnskapsfører, anbefaler vi at du kun installerer Fakturering "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Følgende brukere er blitt installert: \n"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index e726d1e5bee..6b18b673759 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "om alleen de facturatie te installeren "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
@@ -620,23 +620,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Vorige"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave opbouw!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index cfbade8ecb8..7165c5906c9 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
 msgid "City"
-msgstr ""
+msgstr "Plaats"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -44,7 +44,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Bankrekeningnr."
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Rapportvoettekst 1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
@@ -81,7 +81,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Verenigingen"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -89,9 +89,11 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Helpt u om uw boekhouding te voeren. Als u geen boekhouder bent, raden wij u "
+"aan om enkel Facturatie te installeren. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
@@ -100,38 +102,38 @@ msgstr ""
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Configuratie Voortgang"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Rapportvoettekst 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
 #: model:ir.model,name:base_setup.model_res_currency
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Staat/Provincie"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Verkoopbeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -139,6 +141,8 @@ msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
 msgstr ""
+"Hiermee kunt u verschillende interessante modules installeren, zoals "
+"Enquêtes, Lunch en Ideeënbus."
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -146,6 +150,8 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"U kunt beginnen met de configuratie van het systeem of u onmiddellijk als "
+"beheerder aanmelden op de database."
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
@@ -155,12 +161,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -168,11 +174,13 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Met uw bedrijfsinformatie kunt u OpenERP-documenten zoals facturen, "
+"verkooporders, e.d. personaliseren."
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "Titel"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
@@ -215,12 +223,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bedrijfsnaam"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "Configuratieassistenten overslaan"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -239,7 +247,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -259,42 +267,42 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Straat 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Boekhouding & financiën"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "Veilinghuizen"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postcode"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Beginnen met de configuratie"
 
 #. module: base_setup
 #: help:base.setup.installer,knowledge:0
@@ -309,17 +317,20 @@ msgid ""
 "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."
 msgstr ""
+"Selecteer de applicaties die u wilt gebruiken. U kunt later makkelijk extra "
+"modules installeren, wat ook handig is als u op dit moment nog geen "
+"duidelijk zicht heeft op wat u allemaal nodig heeft."
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Bedrijfsconfiguratie"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -332,37 +343,37 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Aankoopbeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "Hiermee kunt u offertes, verkooporders en facturen maken."
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Magazijnbeheer"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projectbeheer"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Geïnstalleerde gebruikers"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nieuwe database"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Klantenrelatiebeheer"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -389,34 +400,34 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Rapporthoofding"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informatie over uw nieuwe database"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Afbeelding"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Voedingsindustrie"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Productie"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -439,17 +450,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "Uw bedrijfsinformatie configureren"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Voorbeeld: http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -487,4 +498,25 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
+
+#~ msgid "Installation Done"
+#~ msgstr "Installatie gereed"
+
+#~ msgid "Summary"
+#~ msgstr "Samenvatting"
+
+#~ msgid "Cancel"
+#~ msgstr "Afbreken"
+
+#~ msgid "Street2"
+#~ msgstr "Adres 2"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "General Information"
+#~ msgstr "Algemene Informatie"
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index ca864e985fb..34b1805d6fc 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -93,7 +93,7 @@ msgstr ""
 "instalowanie tylko fakturowania. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Następujący użytkownicy zostali utworzeni : \n"
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index eded1ec76d7..bab3a42b66f 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "instale apenas o módulo Facturação "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Foram instalados os seguintes utilizadores: \n"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 805c31c37e8..e2934f826da 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "instalação apenas do Faturamento "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Os seguintes usuário foram instalados: \n"
@@ -621,23 +621,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Summary"
 #~ msgstr "Resumo"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID de certificado do módulo precisa ser único !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo precisa ser único !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo nunca pode ser menor que 1 !"
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index b49368f0c4c..825cf43bde1 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -95,7 +95,7 @@ msgstr ""
 "doar modulul de Facturare. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n"
@@ -599,24 +599,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Use Directly"
 #~ msgstr "Folosire directă"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nume invalid de model în definirea acțiunii."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid in afisarea interfetei!"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index a1f21a37fbf..2c9f11ed056 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -96,7 +96,7 @@ msgstr ""
 "— советуем установить только модуль выставления счетов. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Были введены следующие пользователи: \n"
@@ -624,15 +624,3 @@ msgstr "base.setup.config"
 
 #~ msgid "State"
 #~ msgstr "Область/штат"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_ и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index ee7420f836c..b62aea8db20 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 153f9195248..56526b0a68a 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 18d2bc35ead..5d639b81170 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 9dc884c595c..c8df07314fd 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -97,7 +97,7 @@ msgstr ""
 "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Sledeci korisnici su instalirani: \n"
@@ -602,14 +602,3 @@ msgstr "base.setup.config"
 
 #~ msgid "Cancel"
 #~ msgstr "Otkaži"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora poceti sa x_ i ne  sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture !"
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 68831220143..6936cf08005 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -97,7 +97,7 @@ msgstr ""
 "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Sledeci korisnici su instalirani: \n"
@@ -535,20 +535,9 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora poceti sa x_ i ne  sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neispravno ime modela u definiciji akcije."
-
 #~ msgid "Use Directly"
 #~ msgstr "Koristi Direktno"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za pregled arhitekture !"
-
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
 #~ "have been setup to help you discover the different aspects of OpenERP. This "
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index eddd1cce92d..2d883b0a78f 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-14 04:53+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -44,7 +44,7 @@ msgstr "E-post"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "Bankkontonr"
+msgstr "Bankkonto"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -120,7 +120,7 @@ msgstr "Valuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr "Amerikansk stat"
+msgstr "Amerikansk delstat"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
@@ -174,6 +174,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"Dina företagsuppgifter används för att personalisera dokument som OpenERP "
+"skapar, exempelvis fakturor, ordrar och många fler."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -335,6 +337,9 @@ msgid ""
 "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."
 msgstr ""
+"Välj de grundläggande funktioner som du vill konfigurera ditt system med. Är "
+"du osäker på vad du behöver i detta läge så är det inte några problem att "
+"komplettera senare."
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -368,7 +373,7 @@ msgstr "Hjälper dig att hantera dina offerter, ordrar och fakturor."
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Lagerstyrning"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
@@ -447,7 +452,7 @@ msgstr "Tillverkning"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Din logga, välj en storlek kring 450x150 pixlar."
+msgstr "Företagets logotyp - använd en storlek kring 450x150 bildpunkter."
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -463,7 +468,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr "Företagets hemsida"
+msgstr "Företagets webbplats"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -560,18 +565,12 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Nästa"
 
-#~ msgid "State"
-#~ msgstr "Område"
-
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Din nya databas är klar."
 
 #~ msgid "Profile"
 #~ msgstr "Profil"
 
-#~ msgid "General Information"
-#~ msgstr "Generell information"
-
 #~ msgid "Street2"
 #~ msgstr "Gata 2"
 
@@ -596,16 +595,8 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Föregårende"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Felaktig XML för Vyarkitektur!"
+#~ msgid "General Information"
+#~ msgstr "Allmän information"
 
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Namnet på modulen måste vara unikt!"
+#~ msgid "State"
+#~ msgstr "Län"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index ce8506c4def..41ea331d9f0 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 83323df80e8..c1936ad4e0f 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index add2cc50bb1..8212643e31a 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-11 04:36+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -24,7 +24,7 @@ msgstr "Şehir"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install"
-msgstr "kurulum"
+msgstr "Kur"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
@@ -39,7 +39,7 @@ msgstr "İnsan Kaynakları"
 #. module: base_setup
 #: field:base.setup.company,email:0
 msgid "E-mail"
-msgstr "E-Posta"
+msgstr "E-posta:"
 
 #. module: base_setup
 #: field:base.setup.company,account_no:0
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index ed8b0045493..1efa21051e1 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:03+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 5c7aacdebce..2aeb40b17aa 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-05 04:39+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:11+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -35,7 +35,7 @@ msgstr "Hóa đơn"
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr "Quản trị Nguồn nhân lực"
+msgstr "Nguồn nhân lực"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Những người sử dụng sau đã được cài đặt: \n"
@@ -348,7 +348,7 @@ msgstr "Quản lý Kho hàng"
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr "Quản lý dự án"
+msgstr "Quản lý Dự án"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
@@ -489,17 +489,3 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Mã chứng nhận của mô đun này phải là duy nhất !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải bắt đầu với x_ và không chứa bất kỳ ký tự đặc biệt nào!"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Tên của mô đun phải duy nhất !"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 7b34624465b..43abe3d68d9 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -34,7 +34,7 @@ msgstr "发票"
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr "人事管理"
+msgstr "人力资源"
 
 #. module: base_setup
 #: field:base.setup.company,email:0
@@ -44,7 +44,7 @@ msgstr "电子邮件"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr "银行账户"
+msgstr "银行账号"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -54,19 +54,19 @@ msgstr "额外工具"
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
 msgid "Report Footer 1"
-msgstr "报表脚注1"
+msgstr "报表页脚1"
 
 #. module: base_setup
 #: help:base.setup.installer,mrp:0
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
-msgstr ""
+msgstr "帮助您管理您的生产和其生成的报表。"
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr "逐步帮助管理您的市场营销。"
+msgstr "帮助您管理市场营销。"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -81,7 +81,7 @@ msgstr "销售点"
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr "协会"
+msgstr "商会"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -91,27 +91,27 @@ msgid ""
 msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，我们建议您仅仅安装发票模块。 "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "下列用户已经安装 \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+msgstr "设置进度"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
 msgid "Report Footer 2"
-msgstr "报表脚注2"
+msgstr "报表页脚 2"
 
 #. module: base_setup
 #: field:base.setup.company,currency:0
 #: model:ir.model,name:base_setup.model_res_currency
 msgid "Currency"
-msgstr "货币"
+msgstr "币别"
 
 #. module: base_setup
 #: field:base.setup.company,state_id:0
@@ -138,19 +138,19 @@ msgstr "销售管理"
 msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
-msgstr ""
+msgstr "让你安装各种有趣的但非必需的工具如： 调查, 午餐 和 创意"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
-msgstr "您可以选择开始配置系统或者直接作为管理员连接到数据库。"
+msgstr "您可以开始设置系统或者直接作为管理员连接到数据库。"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr "高级报表"
+msgstr "高级报告"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -167,12 +167,12 @@ msgstr "res_config_contents"
 msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
-msgstr ""
+msgstr "你公司的信息会出现在OprnERP的各种文档上，例如发票，销售订单，和其他"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr "title"
+msgstr "标题"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
@@ -198,16 +198,13 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    这模块实现一个配置的系统帮助用户\n"
-"在一个新数据库配置系统\n"
-"\n"
-"    它允许在配置列表中选择安装:\n"
-"   *最小配置\n"
+"    这模块实现一个设置向导系统帮助用户在一个新数据库配置系统\n"
+"  它允许在设置列表中选择安装:\n"
+"    *最小设置\n"
 "    *只有会计\n"
+"    *服务公司\n"
 "    *制造公司\n"
-"\n"
-"    它还询问以帮助简单设置你的公司:\n"
-"                  报表头,注脚,所用的会计表和要安装的语言\n"
+"  它还通过界面对话框来帮助您轻松设置您的公司: 报页头，页脚,所用的会计表和要安装的语言\n"
 "    "
 
 #. module: base_setup
@@ -215,14 +212,14 @@ msgstr ""
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理你的企业"
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "帮助你管理项目，跟踪任务，生成计划等"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -232,21 +229,21 @@ msgstr "公司名称"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr "跳过配置向导"
+msgstr "跳过设置向导"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
 msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
-msgstr ""
+msgstr "帮助你管理你的人力资源员员工架构，生成工作计工单，考勤等"
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
 msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
-msgstr ""
+msgstr "允许你创建发票并跟踪付款,这是一个面向没有会计知识的管理人员的简化版会计模块"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
@@ -266,7 +263,9 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-msgstr "这将显示在报表底部.建议你输入银行的信息"
+msgstr ""
+"这将显示在报表底部。\n"
+"建议你在这输入银行信息："
 
 #. module: base_setup
 #: field:base.setup.company,street2:0
@@ -291,7 +290,7 @@ msgstr "设置"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr "会计与财务"
+msgstr "会计 & 财务"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -313,25 +312,25 @@ msgstr "开始设置"
 msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
-msgstr "让您安装附加的模块使您可以与您的雇员分享知识。"
+msgstr "让您安装模块使您的员工可以分享知识。"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid ""
 "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."
-msgstr ""
+msgstr "选择你系统所包含的模块。如果你当前还不确定，你可以在以后再安装它们"
 
 #. module: base_setup
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr "单位配置"
+msgstr "公司设置"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
 msgid "Logo"
-msgstr "标识"
+msgstr "Logo"
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -339,7 +338,7 @@ msgid ""
 "Helps you get the most out of your points of sales with fast sale encoding, "
 "simplified payment mode encoding, automatic picking lists generation and "
 "more."
-msgstr ""
+msgstr "帮助你快速设定你的销售点，简化付款方式，自动装箱单等"
 
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
@@ -381,7 +380,7 @@ msgstr "客户关系管理"
 msgid ""
 "Installs a preselected set of OpenERP applications selected to help you "
 "manage your auctions as well as the business processes around them."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理拍卖以及相关的业务流程。"
 
 #. module: base_setup
 #: help:base.setup.company,rml_header1:0
@@ -389,7 +388,9 @@ msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
-msgstr "这将显示在报表的右上角,建议你放一个标语."
+msgstr ""
+"这将显示在报表的右上角。\n"
+"建议你在这放一个标语："
 
 #. module: base_setup
 #: help:base.setup.installer,report_designer:0
@@ -423,12 +424,12 @@ msgstr "食品工业"
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr "生产管理"
+msgstr "生产"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "你的标识使用尺寸为450×150像素"
+msgstr "你的Logo使用的尺寸为450×150像素"
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer1:0
@@ -436,7 +437,9 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-msgstr "这将显示在报表底部,建议你放入正式的公司信息."
+msgstr ""
+"这将显示在报表底部。\n"
+"建议你在这放入正式的公司信息和联系方式："
 
 #. module: base_setup
 #: field:base.setup.company,website:0
@@ -446,17 +449,17 @@ msgstr "公司网站"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr "安装特定行业应用"
+msgstr "安装特定的行业模块"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
 msgid "Street"
-msgstr "街区"
+msgstr "街道"
 
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr "配置您的单位信息"
+msgstr "设置您的公司信息"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
@@ -467,7 +470,7 @@ msgstr "例如：http://openerp.com"
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr "安装应用"
+msgstr "安装模块"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -475,14 +478,14 @@ msgid ""
 "Helps you track and manage relations with customers such as leads, requests "
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
-msgstr ""
+msgstr "帮助您跟踪和管理与客户的线索，请求或问题。能自动发送提醒，提升请求等级，基于标准的事件触发指定的商业动作。"
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
 msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
-msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等等"
+msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -494,7 +497,7 @@ msgstr "基础安装"
 msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
-msgstr ""
+msgstr "安装这个OpenERP预设模块，帮助你管理你的商会。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index ffb4074b8d3..a962f97883d 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:12+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_setup
 #: field:base.setup.company,city:0
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
+#: code:addons/base_setup/__init__.py:56
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "已安裝以下用戶： \n"
-- 
cgit v1.2.3


From c02863060fc2c1aabd8efdecfd126daebfcfdae7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 12 Sep 2011 16:49:25 +0200
Subject: [FIX] account, base_setup, hr_timesheet_sheet: improve server
 actions: remove pointless references to self, don't access ids if they're not
 needed

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

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0e1efb40b32..cb00ac3eb5b 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -79,7 +79,7 @@
       <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 = 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"/>
-- 
cgit v1.2.3