trunk merge

bzr revid: aag@tinyerp.co.in-20101014080103-58ysx9lo20h9kogo

48 files changed, 178 insertions, 357 deletions

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 80680b6615e..934e1a3bdf8 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -21,7 +21,6 @@
 
 import installer
 import todo
-import gtk_contact_form
 import wizard
 import os
 import base64
@@ -60,25 +59,15 @@ class base_setup_config_choice(osv.osv_memory):
          'config_logo' : _get_image
         }
 
-    def set_default_menu(self, cr, uid, menu, context=None):
-        user = self.pool.get('res.users')\
-                        .browse(cr, uid, uid, context=context)
-
-        user.write({'action_id': menu.id,
-                    'menu_id': menu.id})
-
-    def get_default_menu(self, cr, uid, context=None):
-        actions = self.pool.get('ir.actions.act_window')
-
-        current_menu_id = actions.search(cr, uid, [('name','=','Menu')],
-                                         context=context)
-        assert len(current_menu_id) == 1,\
-               'A given user should only have one menu item'
-        return actions.browse(cr, uid, current_menu_id[0], context=context)
+    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.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
+        menu = self.reset_menu(cr, uid, context=context)
 
         if menu.view_id.id:
             view_id = (menu.view_id.id, menu.view_id.name)
@@ -98,9 +87,7 @@ class base_setup_config_choice(osv.osv_memory):
         }
 
     def config(self, cr, uid, ids, context=None):
-        menu = self.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
-
+        self.reset_menu(cr, uid, context=context)
         return self.pool.get('res.config').next(cr, uid, [], context=context)
 
 base_setup_config_choice()
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 4245f3da206..13906abe6ba 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -25,17 +25,24 @@
           </separator>
             
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,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,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,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,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,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,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,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,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,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,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,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,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,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,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,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <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" 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>
         </data>
       </field>
@@ -54,6 +61,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>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 8151442855b..7cd0563aafe 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -66,7 +66,7 @@
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
-        <field name="sequence">3</field>
+        <field name="sequence">1</field>
         <field name="restart">onskip</field>
     </record>
   </data>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
deleted file mode 100644
index c62951b13b7..00000000000
--- a/addons/base_setup/gtk_contact_form.py
+++ /dev/null
@@ -1,114 +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 operator import itemgetter
-
-from osv import osv, fields
-import netsvc
-import tools
-from tools import misc
-
-class base_gtkcontactform(osv.osv_memory):
-    """
-    """
-    _name = 'base.gtkcontactform'
-    _inherit = 'res.config'
-    logger = netsvc.Logger()
-
-    def default_get(self, cr, uid, fields_list=None, context=None):
-         ''' set email and phone number selected in the previous company information
-             form '''
-         defaults = super(base_gtkcontactform, self)\
-         .default_get(cr, uid, fields_list=fields_list, context=context)
-         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-         company = self.pool.get('base.setup.company').read(cr, uid, company_id)
-         company = company and company[0] or False
-         if company:
-             defaults.update({'email':company.get('email',''),
-                          'phone': company.get('phone','')})
-         return defaults
-
-    _columns = {
-             'name':fields.char('Your Name', size=64),
-             'job':fields.char('Job Title', size=64,),
-             'email':fields.char('E-mail', size=64),
-             'phone':fields.char('Phone', size=64),
-             'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
-             'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
-                                          ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
-                                          ('entertainment','Entertainment'),('environmental','Environmental'),('finance','Finance'),('government','Government'),('healthcare','Healthcare'),('hospitality','Hospitality'),
-                                          ('insurance','Insurance'),('machinery','Machinery'),('manufacturing','Manufacturing'),('media','Media'),('notforprofit','Not For Profit'),
-                                          ('recreation','Recreation'),('retail','Retail'),('shipping','Shipping'),('technology','Technology'),('telecommunications','Telecommunications'),
-                                          ('transportation','Transportation'),('utilities','Utilities'),('other','Other'),
-                                          ], 'Industry', size=32),
-             'use_openerp':fields.boolean('We plan to use OpenERP'),
-             'already_using_openerp':fields.boolean('Already using OpenERP'),
-             'sell_openerp':fields.boolean('Plan to sell OpenERP'),
-             'already_selling__openerp':fields.boolean('Already selling OpenERP'),
-
-             'features':fields.boolean('The features of OpenERP'),
-             'saas':fields.boolean('OpenERP Online Solutions (SaaS)'),
-             'partners_program':fields.boolean('OpenERP Partners Program (for integrators)'),
-             'support':fields.boolean('Support and Maintenance Solutions'),
-             'training':fields.boolean('OpenERP Training Program'),
-             'other':fields.boolean('Other'),
-             'ebook':fields.boolean('ebook'),
-             'updates':fields.boolean('Updates'),
-             }
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-
-        company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context)
-        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
-        company_data = company_data and company_data[0] or {}
-        country = ''
-
-        if company_data.get('country_id', False):
-            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
-
-        for res in self.read(cr, uid, ids, context=context):
-            email = res.get('email','')
-            result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
-            result += "\nname: " + tools.ustr(res.get('name',''))
-            result += "\njob: " + tools.ustr(res.get('job',''))
-            result += "\nphone: " + str(res.get('phone',''))
-            result += "\ncity: " + tools.ustr(company_data.get('city',''))
-            result += "\ncountry: " + str(country)
-            result += "\nindustry: " + tools.ustr(res.get('industry', ''))
-            result += "\ntotal_employees: " + str(res.get('total_employees', ''))
-            result += "\nplan_use: " +  str(res.get('use_openerp', False))
-            result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False))
-            result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
-            result += "\nalready_selling__openerp: " + str(res.get('already_selling__openerp', False))
-            result += "\nfeatures: " +  str(res.get('features', False))
-            result += "\nsaas: " +  str(res.get('saas', False))
-            result += "\npartners_program: " +  str(res.get('partners_program', False))
-            result += "\nsupport: " +  str(res.get('support', False))
-            result += "\ntraining: " +  str(res.get('training', False))
-            result += "\nupdates: " +  str(res.get('updates', False))
-            result += "\ncontact_me: " +  str(res.get('contact_me', False))
-            result += "\nebook: " + str(res.get('ebook',False))
-            result += "\ngtk: " + str(True)
-        misc.upload_data(email, result, type='SURVEY')
-
-
-
-base_gtkcontactform()
\ No newline at end of file
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
deleted file mode 100644
index 660187a8ce0..00000000000
--- a/addons/base_setup/gtk_contact_form.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_base_setup_contact" model="ir.ui.view">
-      <field name="name">Contact information</field>
-      <field name="model">base.gtkcontactform</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">Contact Information</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Would you like more information or documentation ?</attribute>
-                    <attribute name='colspan'>4</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>22</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="4" height="450" width="600">
-                   <group colspan="4">
-                     <field name="ebook" nolabel="1"/>
-                    <label align="0.0" string="I want to receive the OpenERP ebook (PDF) by email." colspan="3"/>
-                    <field name="updates" nolabel="1"/>
-                    <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
-               </group>
-                  <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-                       <separator colspan="4" string="About You"/>
-                    <field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="job" colspan="2"/>
-                    <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="total_employees" colspan="2"/>
-                    <field name="industry" colspan="2"/>
-                </group>
-                <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-                    <separator string="Your projects with OpenERP" colspan="4"/>
-                    <field name="use_openerp" align="0.0"  colspan="1"/>
-                    <field name="already_using_openerp" align="0.0"  colspan="1"/>
-                    <field name="sell_openerp" align="0.0"  colspan="1"/>
-                    <field name="already_selling__openerp" align="0.0" colspan="1"/>
-                    <separator colspan="4" string="You would like to know more about"/>
-                    <field name="features" align="0.0" colspan="1"/>
-                    <field name="training" align="0.0" colspan="1"/>
-                    <field name="saas" align="0.0" colspan="1"/>
-                    <field name="support" align="0.0" colspan="1"/>
-                    <field name="partners_program" align="0.0" colspan="1"/>
-                    <field name="other" align="0.0" colspan="1"/>
-               </group>
-           </group>
-           </group>
-        </data>
-      </field>
-    </record>
-
-    <record id="action_base_contact" model="ir.actions.act_window">
-      <field name="name">Setup contact information</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.gtkcontactform</field>
-      <field name="view_id" ref="view_base_setup_contact"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base_setup_contact_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_contact"/>
-        <field name="sequence">5</field>
-        <field name="restart">never</field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index e058acd74a8..512f91a1e7c 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 9c52f705afd..2180b79a73d 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index e058acd74a8..44b26d929b8 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-09-29 09:28+0000\n"
+"Last-Translator: OpenERP Administrators <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: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -21,7 +21,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,city:0
 #: wizard_field:base_setup.base_setup,update,city:0
 msgid "City"
-msgstr ""
+msgstr "Grad"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
@@ -29,34 +29,37 @@ msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
 msgstr ""
+"Možete početi s konfiguracijom sustava ili se izravno spojiti na bazu "
+"podataka koristeći predefinirane postavke."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
 msgid "Zip code"
-msgstr ""
+msgstr "Poštanski broj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid "Select a Profile"
-msgstr ""
+msgstr "Odaberite Profil"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report header"
-msgstr ""
+msgstr "Zaglavlje Izvještaja"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Započnite konfiguriranje"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
 msgstr ""
+"Moći ćete instalirati više modula kasnije kroz izbornik Admininstracija"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -65,88 +68,91 @@ msgid ""
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
 msgstr ""
+"Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
+"podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
+"osvrt, postoji 300+ raspoloživih modula."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
 #: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
-msgstr ""
+msgstr "Dalje"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Kanton/Regija"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Podnožje izvještaja 1"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Podnožje izvještaja 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr ""
+msgstr "Opće informacije"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Ulica2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Informacija o izvještaju"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr ""
+msgstr "Odredite glavno poduzeće"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Naziv poduzeća"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer2:0
@@ -157,13 +163,16 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete bankovne podatke:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - PDV: BE0477.472.701"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Država"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
@@ -173,7 +182,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Podešavanje"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -184,21 +193,24 @@ 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 ""
+"Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete osnovne podatke:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,update,finish:0
 msgid "Install"
-msgstr ""
+msgstr "Instaliraj"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalacija završena"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_header1:0
@@ -209,57 +221,60 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Ova će se rečenica pojavljivati u gornjem desno kutu vaših izvještaja.\n"
+"Savjetujemo vam da ovdje upišete slogan tvrtke:\n"
+"\"Open Source Business Solutions\""
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Zaglavlje izvještaja"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr ""
+msgstr "Ulica"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
 msgid "Use Directly"
-msgstr ""
+msgstr "Koristiti izravno"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,init,menu:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,logo:0
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logotip"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Osnovno podešavanje"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
-msgstr ""
+msgstr "Prethodno"
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 9768142901b..0f92e28c260 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index dc5ebd48dc7..92b84114490 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 27fe0c83927..b7fec6b9f49 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 3c0b8127e45..7172fe184b6 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index f99fb0171b3..00a0b434fe5 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 7d6e3a6feef..599ddd8483b 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 68f2daea45a..0b95fc4ed1c 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index eac60bb6fd8..4582ebea624 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 273afb9d691..adf6e99ca72 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 4504c974d8b..e0ef3d5e4fa 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index a09ce0987aa..151e8540e15 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 9686f0fcbbf..aa137043dc5 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index f32a51e4a01..2b3af3b2753 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index e058acd74a8..512f91a1e7c 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 3121b8240ba..2a5b7727a9e 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 652a745b863..b6172947709 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index 3e5039ae56b..b011b8c89cf 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index f5c86cbfaf5..f9616fc7b18 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 85139663223..63fb69a8e12 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 03:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-09-29 11:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -22,7 +22,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,city:0
 #: wizard_field:base_setup.base_setup,update,city:0
 msgid "City"
-msgstr ""
+msgstr "Хот"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
@@ -30,34 +30,37 @@ msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
 msgstr ""
+"Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
+"холболт хийж болно."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
 msgid "Zip code"
-msgstr ""
+msgstr "Зип код"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid "Select a Profile"
-msgstr ""
+msgstr "Хувийн мэдээллээ сонгох"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report header"
-msgstr ""
+msgstr "Толгойн мэдээлэл"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Тохируулж эхлэх"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
 msgstr ""
+"Та цаашид удирдлагын цэсээр дамжин нэмэлт модулууд суулгах боломжтой."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -66,88 +69,91 @@ msgid ""
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
 msgstr ""
+"Тодорхой шаардлагаар модулуудыг урьдчилан сонгон хувийн тохиргоонд "
+"байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
+"нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
 #: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
-msgstr ""
+msgstr "Дараагийх"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "И-мэйл"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Төлөв"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Таны шинэ бааз бүрэн суусан."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr ""
+msgstr "Хувийн мэдээлэл"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Хөлийн мэдээ 1"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Хөлийн мэдээ 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr ""
+msgstr "Ерөнхий мэдээлэл"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Гудамж 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Мэдээ мэдээлэл"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Утас"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr ""
+msgstr "Үндсэн компани тодорхойлох"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Компанийн нэр"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer2:0
@@ -158,13 +164,16 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
+"Банкны мэдээлэл ээ энд оруулана уу:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Улс"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
@@ -174,7 +183,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Тохируулга"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -185,21 +194,24 @@ 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 ""
+"Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
+"Албан ёсны мэдээлэл ээ энд оруулна уу:\n"
+"Вэб: http://openerp.com - Факс: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
-msgstr ""
+msgstr "Дүгнэлт"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,update,finish:0
 msgid "Install"
-msgstr ""
+msgstr "Суулгах"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Суулгагдсан"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_header1:0
@@ -210,57 +222,60 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Энэ өгүүлбэр таны тайлангийн баруун дээд буланд харагдана.\n"
+"Уриагаа энд байрлуулахыг зөвлөж байна:\n"
+"\"Нээлттэй Эхийн Бизнес Шийдэл\"."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Толгойн мэдээ"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Таны лого-450х150 хэмжээтэй"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Валют"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr ""
+msgstr "Гудамж"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
 msgid "Use Directly"
-msgstr ""
+msgstr "Шууд хэрэглэх"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,init,menu:0
 msgid "Cancel"
-msgstr ""
+msgstr "Цуцлах"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,logo:0
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Лого"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Үндсэн тохируулга"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
-msgstr ""
+msgstr "Өмнөх"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 12ba5fa6746..4c40197553e 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 41db2ad2293..aa080374753 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index c1bc388d606..7a27761c4a7 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index ff12134d608..788b3baf22e 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 61ad6029d49..068e5706983 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index 56f76fc6e40..1c7a0665eaf 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index d32f8a19946..8ed8df84629 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-28 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 23be12a3bdc..a674c121ac5 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 97f46666aba..dbf8a8b12b9 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 1b4bad0202a..32788de3998 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index bb0592ae214..53bd12e5688 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 5571249d384..49b25fc8318 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 7ac9438628a..d6f8cf863e9 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index ee65b43e814..f7fc3dac422 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 16d45e4e367..e28c39d0c1b 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-08 09:13+0000\n"
+"PO-Revision-Date: 2010-09-09 07:16+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-09-09 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 589ffe49a18..0af2cabe1fa 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index ab70b130197..016d67478f3 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index e9a3536d0b2..fe9c9694ae8 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 71417425950..3d212d2ea58 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index f415447e5fb..e23f1171752 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -27,8 +27,7 @@ class base_setup_installer(osv.osv_memory):
     _install_if = {
         ('sale','crm'): ['sale_crm'],
         ('sale','project'): ['project_mrp'],
-        ('sale',):['account_accountant']
-        }
+    }
     _columns = {
         # Generic modules
         'crm':fields.boolean('Customer Relationship Management',
@@ -46,14 +45,14 @@ class base_setup_installer(osv.osv_memory):
             help="Lets you install addons geared towards sharing knowledge "
                  "with and between your employees."),
         'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your stocks and stocks locations, as well "
-                 "as the flow of stock between warehouses."),
+            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':fields.boolean('Financial & Accounting',
-            help="Helps you handle your accounting needs, as well as create "
-                 "and track your budgets."),
+        'account_voucher':fields.boolean('Invoicing',
+            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..."),
@@ -84,9 +83,6 @@ class base_setup_installer(osv.osv_memory):
                  "applications selected to help you manage your auctions "
                  "as well as the business processes around them."),
         }
-    _defaults = {
-        'crm': True,
-        }
 
     def _if_knowledge(self, cr, uid, ids, context=None):
         if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
@@ -95,16 +91,7 @@ class base_setup_installer(osv.osv_memory):
         return None
 
     def _if_misc_tools(self, cr, uid, ids, context=None):
-        interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
-        if interface == 'simple' or interface =='extended' :
-            return ['profile_tools']
-        return None
-
-    def _if_account(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['account_voucher']
-        return None
+        return ['profile_tools']
 
     def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
         value = {}
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 5f293257a91..ae16f260876 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -86,7 +86,7 @@ class base_setup_company(osv.osv_memory):
         '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, 'State'),
+        '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),
@@ -104,8 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
 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('Account No', size=64),
-        'website': fields.char('Web', size=64),
+        '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):