[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110103041826-atjzj7zbs8ayxrl1
bzr revid: sbh@tinyerp.com-20110104050350-ht7063oddesu3esy

2 files changed, 28 insertions, 7 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 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-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 ""
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 3eee6f2985b..f2530273b70 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-28 07:57+0000\n"
+"PO-Revision-Date: 2011-01-01 07:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -77,6 +77,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Questo modulo vi permette di definire qual'è la funzione default di uno "
+"specifico utente su un dato conto. Questo è molto utile quando un utente "
+"codifica il suo timesheet: i valori sono recuperati e i campi sono compilati "
+"automaticamente... ma la possibilità di cambiare questi valori è ancora "
+"disponibile.\n"
+"\n"
+"    Ovviamente se nessun dato è stato impostato per il conto attuale, è "
+"fornito il valore di default, come al solito, prelevato dai dati impiegato "
+"in modo che, questo modulo, risulti perfettamente compatibile con vecchie "
+"configurazioni.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information