[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

3 files changed, 19 insertions, 14 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 772771db915..a1209492490 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -84,9 +84,11 @@ class email_server(osv.osv):
     def check_model(self, cr, uid, ids, context = None):
         if context is None:
             context = {}
-        current_rec = self.read(cr, uid, ids, context)[0]
+        current_rec = self.read(cr, uid, ids, context)
         if current_rec:
-            model = self.pool.get(current_rec.get('object_id')[1])
+            current_rec = current_rec[0]
+            model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model
+            model = self.pool.get(model_name)
             if hasattr(model, 'message_new'):
                 return True
         return False
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 28aaf84053d..b671dad3b0b 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:28+0000\n"
+"PO-Revision-Date: 2010-12-28 13:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\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-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Warnung ! Datensatz für das ausgewählte Modul kann nicht erstellt werden\n"
+"Bitte wählen Sie ein gültiges Modul aus"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"OpenObject Modul. Erzeugt einen Datensatz aus diesem Modul.\n"
+"Wähle Objekt mit message_new Attribut."
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "Hinzufügen Anhang ?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "# EMails"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -219,7 +223,7 @@ msgstr "POP/IMAP Server"
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "Warnung ! Doppelte Server Konfiguration ist nicht möglich !"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -294,7 +298,7 @@ msgstr "Priorität 0 bis 10, wähle entsprechende Reihenfolge"
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "EMail Serveraktion"
 
 #. module: fetchmail
 #: field:email.server,priority:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index adcd4fab2dd..5342190b1f9 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-19 22:23+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 15:55+0000\n"
+"Last-Translator: Aline (OpenERP) <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-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -101,7 +100,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Email History"
-msgstr ""
+msgstr "Historique des courriels"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
@@ -156,7 +155,7 @@ msgstr "Message pour la passerelle de courriel"
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "Serveurs POP"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -172,7 +171,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Fetchmail Services"
-msgstr ""
+msgstr "Services Fetchmail"
 
 #. module: fetchmail
 #: field:email.server,server:0