[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121206154239-1guegkx34y6csc0t

1 files changed, 84 insertions, 31 deletions

diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index c47e4d70cf9..8a41a96f672 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -7,31 +7,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-12-27 15:49+0000\n"
 "Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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: 2012-10-30 05:20+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
-"Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -40,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Korisnik/Proizvod Odnos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Greška !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -76,9 +99,26 @@ msgid "Timesheet Line"
 msgstr "Niz kontrolne kartice"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Korisnički proizvod za ovaj Analitički Konto"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška !"
+
+#~ msgid "Product"
+#~ msgstr "Proizvod"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
@@ -91,7 +131,20 @@ msgstr "Korisnički proizvod za ovaj Analitički Konto"
 #~ msgid "Analytic User Function"
 #~ msgstr "Korisnicka Funkcija Analitike"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Korisnički proizvod za ovaj Analitički Konto"