merge from trunk

bzr revid: goran.kliska@slobodni-programi.hr-20121210111404-jcwlv3nsa16bu8zq

1 files changed, 52 insertions, 23 deletions

diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 0bb3a2947b8..b75fdf6df4f 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,18 +16,33 @@ msgstr ""
 "Plural-Forms: \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"
+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"
+msgid "Price per User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -37,42 +52,56 @@ msgid "Analytic Account"
 msgstr ""
 
 #. 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 ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: 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 ""
 
 #. 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 !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: 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
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""