summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authormtr <mtr@mtr>2011-01-05 13:57:02 +0530
committermtr <mtr@mtr>2011-01-05 13:57:02 +0530
commit6c2dc909c173453cea1ca0e35e5845ea2df154a2 (patch)
tree7c6063b890d8a0d635de8adc4e6c3efba733593b /addons/analytic_user_function
parentfd120595c6b429daf498c8f8e5bbf86b1f40bba8 (diff)
parenta124598535c50d422ad146b4d17ee505eee2337b (diff)
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110105082702-0vy3oe5t2etwfm52
Diffstat (limited to 'addons/analytic_user_function')
-rwxr-xr-xaddons/analytic_user_function/i18n/analytic_user_function.pot17
1 files changed, 12 insertions, 5 deletions
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index ff2e4d75cf5..3a8e9b34445 100755
--- 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-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,8 @@ msgid "Product"
msgstr ""
#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
#, python-format
msgid "Error !"
msgstr ""
@@ -49,7 +50,13 @@ msgid "User"
msgstr ""
#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+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
#, python-format
msgid "There is no expense account define for this product: \"%s\" (id:%d)"
msgstr ""