[MERGE] From trunk

bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28

5 files changed, 97 insertions, 66 deletions

diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 08df5642b54..95a21586cdc 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -7,45 +7,44 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2011-01-16 18:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2012-12-11 13:06+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-12 04:40+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línea analítica"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Precio de facturación por usuario"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Precio por usuario"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Precio"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Precio por hora para este usuario."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -58,12 +57,12 @@ msgstr "Cuenta analítica"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Datos de facturación"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -79,11 +78,14 @@ msgid ""
 "                            of the default values when invoicing the "
 "customer."
 msgstr ""
+"Define un servicio específico (por ejemplo, consultor senior) y un precio "
+"para que ciertos usuarios utilicen estos datos en lugar de los datos por "
+"defecto cuando se facture al cliente."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -107,6 +109,9 @@ msgid ""
 "                            specific user. This allows to set invoicing\n"
 "                            conditions for a group of contracts."
 msgstr ""
+"OpenERP buscará recursivamente en las cuentas padres para comprobar si se "
+"han definido condiciones específicas para el usuario en concreto. Esto "
+"permite establecer condiciones de facturación para un grupo de contratos."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 3a4c90ff4a7..8df85533e55 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -7,44 +7,44 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2011-01-12 16:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-11 08:02+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-12 04:40+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Riga analitica"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Tasso di prezzo fatturato per utente"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Servizio"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Prezzo per utente"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Prezzo"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Prezzo per ora utente corrente"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -57,12 +57,12 @@ msgstr "Conto Analitico"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Errore!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dati Fatturazione"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -78,11 +78,14 @@ msgid ""
 "                            of the default values when invoicing the "
 "customer."
 msgstr ""
+"Definisce un servizio specifico (es. Consulente Senjor)\n"
+"ed un prezzo per alcuni utenti per usare poi questo dato al posto\n"
+"del valore predefinito durante la fatturazione al cliente."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unità di misura"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -106,6 +109,10 @@ msgid ""
 "                            specific user. This allows to set invoicing\n"
 "                            conditions for a group of contracts."
 msgstr ""
+"OpenERP cercherà ricorsivamente sui conti padre\n"
+"per verificare se condizioni specifiche sono definite per\n"
+"un dato utente. Questo permette di impostare le\n"
+"condizioni di fatturazione per un gruppo di contratti."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index f8222036302..517ccf05e24 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -7,44 +7,44 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-01-02 01:26+0000\n"
-"Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
+"PO-Revision-Date: 2012-12-16 11:16+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Pozycja analityczna"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Procent ceny faktury na użytkownika"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Usługa"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Cena na użytkownika"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Cena godzinowa dla użytkownika"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -57,17 +57,17 @@ msgstr "Konto analityczne"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Błąd!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dane fakturowane"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Zależność Użytk./Produkt"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -78,23 +78,27 @@ msgid ""
 "                            of the default values when invoicing the "
 "customer."
 msgstr ""
+"Zdefiniuj specjalną usługę (np. Zaawansowane konsultacje)\n"
+"                            i ceny dla dla części użytkowników, aby je "
+"stosować\n"
+"                            zamiast domyślnych wartości przy fakturowaniu."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Jednostka Miary"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
 #: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Brak konta rozchodów dla produktu: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -105,6 +109,11 @@ msgid ""
 "                            specific user. This allows to set invoicing\n"
 "                            conditions for a group of contracts."
 msgstr ""
+"OpenERP przeszuka rekurencyjnie konta nadrzędne\n"
+"                            aby sprawdzić specjalne warunki dla\n"
+"                            konkretnego użytkownika. To pozwoli\n"
+"                            ustawić warunki fakturowania dla\n"
+"                            grupy umów."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 6624a55cb8d..7ed8735d5be 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-12-04 09:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-12 16:27+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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
@@ -29,22 +29,22 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Preço por utilizador"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Preço à hora para este utilizador."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -57,12 +57,12 @@ msgstr "Conta Analítica"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dados de faturação"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -82,7 +82,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de medida"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index 8a77d1d48df..f81a39b09ac 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -7,45 +7,45 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-07-28 16:30+0000\n"
+"PO-Revision-Date: 2012-12-16 22:37+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha Analítica"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Variação de preço da Fatura por usuário"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Preço por Usuário"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Preço por hora para este usuário."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -58,12 +58,12 @@ msgstr "Conta Analítica"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dados de Faturamento"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -79,11 +79,15 @@ msgid ""
 "                            of the default values when invoicing the "
 "customer."
 msgstr ""
+"Definir um serviço específico (Consultor Sênior, por exemplo)\n"
+"                             e preço para alguns usuários utilizarem esses "
+"dados em vez\n"
+"                             dos valores padrão quando faturarem um cliente."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -106,6 +110,12 @@ msgid ""
 "                            specific user. This allows to set invoicing\n"
 "                            conditions for a group of contracts."
 msgstr ""
+"O OpenERP vai pesquisar recursivamente em contas pais\n"
+"                             para verificar se as condições específicas são "
+"definidas por um\n"
+"                             usuário específico. Isto permite configurar "
+"condições de\n"
+"                             faturamento para um grupo de contratos."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0