summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/i18n/analytic_user_function.pot
diff options
context:
space:
mode:
authorXavier ALT <xal@openerp.com>2012-12-21 11:03:30 +0100
committerXavier ALT <xal@openerp.com>2012-12-21 11:03:30 +0100
commit6f0f58562d1918d89bbdd6e05cb46f5f0ffd9b02 (patch)
tree53b02fa949afd8e84f938bc77c9ce478089b6148 /addons/analytic_user_function/i18n/analytic_user_function.pot
parentafc2b06042284a122dc44cbd8f85f55a1cd99874 (diff)
parent1dbea4a07a37325e420e26b3429e4a27f3e8e308 (diff)
[MERGE] sync with latest trunk @2012-12-21
bzr revid: xal@openerp.com-20121221100330-b0aw0q6txzbq9t0g
Diffstat (limited to 'addons/analytic_user_function/i18n/analytic_user_function.pot')
-rw-r--r--addons/analytic_user_function/i18n/analytic_user_function.pot23
1 files changed, 4 insertions, 19 deletions
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 52a0384401f..b75fdf6df4f 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 02:52+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"
@@ -31,8 +31,8 @@ msgid "Service"
msgstr ""
#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You cannot create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Price per User"
msgstr ""
#. module: analytic_user_function
@@ -46,11 +46,6 @@ msgid "Price per hour for this user."
msgstr ""
#. module: analytic_user_function
-#: 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
#: model:ir.model,name:analytic_user_function.model_account_analytic_account
msgid "Analytic Account"
@@ -81,11 +76,6 @@ msgid "Define a specific service (e.g. Senior Consultant)\n"
msgstr ""
#. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Price per User"
-msgstr ""
-
-#. module: analytic_user_function
#: field:analytic.user.funct.grid,uom_id:0
msgid "Unit of Measure"
msgstr ""
@@ -98,11 +88,6 @@ msgid "There is no expense account define for this product: \"%s\" (id:%d)"
msgstr ""
#. module: analytic_user_function
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-
-#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
msgid "Timesheet Line"
msgstr ""