[MERGE] from trunk

bzr revid: chm@openerp.com-20121221134901-msdq5zr29946s757

3 files changed, 53 insertions, 34 deletions

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index c2a7ae8f05a..ec2aa1688d6 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from tools.translate import _
-import decimal_precision as dp
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
 
 class analytic_user_funct_grid(osv.osv):
     _name="analytic.user.funct.grid"
@@ -96,10 +96,10 @@ class hr_analytic_timesheet(osv.osv):
             res.setdefault('value',{})
             res['value']= super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)['value']
             res['value']['product_id'] = r.product_id.id
-            res['value']['product_uom_id'] = r.product_id.product_tmpl_id.uom_id.id
+            res['value']['product_uom_id'] = r.product_id.uom_id.id
 
             #the change of product has to impact the amount, uom and general_account_id
-            a = r.product_id.product_tmpl_id.property_account_expense.id
+            a = r.product_id.property_account_expense.id
             if not a:
                 a = r.product_id.categ_id.property_account_expense_categ.id
             if not a:
@@ -128,7 +128,7 @@ class hr_analytic_timesheet(osv.osv):
                 res['value']['product_id'] = r.product_id.id
 
                 #the change of product has to impact the amount, uom and general_account_id
-                a = r.product_id.product_tmpl_id.property_account_expense.id
+                a = r.product_id.property_account_expense.id
                 if not a:
                     a = r.product_id.categ_id.property_account_expense_categ.id
                 if not a:
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_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