[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20101216055348-7yrvv48hjq15grv9

6 files changed, 57 insertions, 27 deletions

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 934e1a3bdf8..85d01779842 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -42,10 +42,10 @@ class base_setup_config_choice(osv.osv_memory):
         file_data = tools.file_open(path,'rb').read()
         return base64.encodestring(file_data)
 
-    def get_users(self, cr, uid, context={}):
+    def get_users(self, cr, uid, context=None):
         user_obj = self.pool.get('res.users')
         user_ids = user_obj.search(cr, uid, [])
-        users = user_obj.browse(cr, uid, user_ids)
+        users = user_obj.browse(cr, uid, user_ids, context=context)
         user_str = '\n'.join(map(lambda x: '    - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users))
         return _('The following users have been installed : \n')+ user_str
 
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index 7e805fb28bf..a1403b195f3 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,18 @@ msgid "City"
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr ""
+
+#. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
 msgstr ""
 
 #. module: base_setup
@@ -150,6 +155,11 @@ msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.company:0
+msgid "Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more."
+msgstr ""
+
+#. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
 msgstr ""
@@ -170,8 +180,8 @@ msgid "Helps you manage your projects and tasks by tracking them, generating pla
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:base.setup.company,name:0
+msgid "Company Name"
 msgstr ""
 
 #. module: base_setup
@@ -190,8 +200,8 @@ msgid "Allows you to create your invoices and track the payments. It is an easie
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
 msgstr ""
 
 #. module: base_setup
@@ -252,6 +262,12 @@ msgid "Lets you install addons geared towards sharing knowledge with and between
 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 ""
+
+#. module: base_setup
+#: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
 msgstr ""
@@ -262,6 +278,11 @@ msgid "Logo"
 msgstr ""
 
 #. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+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 ""
+
+#. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
 msgstr ""
@@ -368,8 +389,8 @@ msgid "Street"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
 msgstr ""
 
 #. module: base_setup
@@ -378,6 +399,7 @@ msgid "Example: http://openerp.com"
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
 msgstr ""
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index c0a2e5446ee..eb9d468da4f 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 13:34+0000\n"
-"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 03:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@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-12-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+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 8084db5fc8f..0e60eea8360 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.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: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-11 23:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 13:07+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <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-12-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -57,11 +57,13 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Ajuda-o a gerir os seus processos de produção e gera relatórios relativos "
+"aos mesmos."
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Ajuda-o a gerir as suas campanhas de marketing, passo a passo"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -89,7 +91,7 @@ msgstr ""
 #: code:addons/base_setup/__init__.py:0
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "Foram instalados os seguintes utilizadores: \n"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -111,7 +113,7 @@ msgstr "Moeda"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Distrito"
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
@@ -141,11 +143,13 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Pode começar a configurar o sistema ou ligar-se diretamente à base de dados, "
+"como administrador"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Relatórios avançados"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -180,6 +184,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Ajuda-o a gerir os seus projetos e tarefas, registando-os, gerando "
+"planeamentos, etc..."
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -253,7 +259,7 @@ msgstr "Configurar"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilidade e Finanças"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -276,6 +282,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Permite-lhe instalar extras com o objetivo de partilhar informações com e "
+"entre os seus empregados."
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 3e5ba6544f5..5ab549d5504 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 21:10+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-14 23:07+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-12-14 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index b30669382a5..c7478801598 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -65,7 +65,7 @@ class base_setup_company(osv.osv_memory):
         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])
+        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):