[MERGE] from trunk

bzr revid: rco@openerp.com-20120203133947-ev7o3vz28k39261m

1 files changed, 22 insertions, 33 deletions

diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 3a8e9b34445..9200d7b45b9 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.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
-"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
+"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
+"PO-Revision-Date: 2011-12-22 18:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,24 +16,22 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 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 "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -45,7 +43,7 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
@@ -55,40 +53,31 @@ msgid "Error! The currency has to be the same as the currency of the selected co
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: 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)"
 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 ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid "\n"
-"\n"
-"    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 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
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""