From 2264cf3f21bde2afbcd62a6b93598459fea1053e Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Wed, 20 Feb 2013 10:30:50 +0530 Subject: [IMP]:Outlook blugin for 32 and 64bit bzr revid: aja@tinyerp.com-20130220050050-oqk1tvi41uib20fc --- addons/plugin/plugin_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/plugin') diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 0664af1c92e..434f557bca2 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -95,14 +95,13 @@ class plugin_handler(osv.osv_memory): msg = self.pool.get('mail.thread').message_parse(cr, uid, email) message_id = msg.get('message-id') mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)]) - if message_id and mail_ids : mail_record = mail_message.browse(cr, uid, mail_ids)[0] res_id = mail_record.res_id notify = "Email already pushed" elif res_id == 0: if model == 'res.partner': - notify = 'User the Partner button to create a new partner' + notify = 'Use the Partner button to create a new partner' else: res_id = model_obj.message_process(cr, uid, model, email) notify = "Mail successfully pushed, a new %s has been created " % model @@ -155,6 +154,7 @@ class plugin_handler(osv.osv_memory): push_mail = self.push_message(cr, uid, model, headers, res_id) res_id = push_mail[1] model = push_mail[0] + notify = push_mail[3] for name in attachments.keys(): attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', model), ('res_id', '=', res_id), ('datas_fname', '=', name)]) if attachment_ids: @@ -166,4 +166,4 @@ class plugin_handler(osv.osv_memory): if mail_ids: ids = mail_message.write(cr, uid, mail_ids[0], { 'attachment_ids': [(6, 0, attach_ids)],'body':body,'body_html':body_html}) url = self._make_url(cr, uid, res_id, model) - return (model, res_id, url) + return (model, res_id, url,notify) -- cgit v1.2.3 From fc04522286417198e1f19b010cbacd02f56f1c3b Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 28 Mar 2013 06:05:00 +0000 Subject: Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw --- addons/plugin/i18n/ar.po | 4 ++-- addons/plugin/i18n/cs.po | 4 ++-- addons/plugin/i18n/de.po | 4 ++-- addons/plugin/i18n/es.po | 4 ++-- addons/plugin/i18n/es_CR.po | 4 ++-- addons/plugin/i18n/fi.po | 4 ++-- addons/plugin/i18n/fr.po | 4 ++-- addons/plugin/i18n/hr.po | 4 ++-- addons/plugin/i18n/hu.po | 4 ++-- addons/plugin/i18n/it.po | 4 ++-- addons/plugin/i18n/ja.po | 4 ++-- addons/plugin/i18n/mk.po | 4 ++-- addons/plugin/i18n/mn.po | 4 ++-- addons/plugin/i18n/nb.po | 4 ++-- addons/plugin/i18n/nl.po | 4 ++-- addons/plugin/i18n/pt.po | 4 ++-- addons/plugin/i18n/pt_BR.po | 4 ++-- addons/plugin/i18n/ro.po | 4 ++-- addons/plugin/i18n/ru.po | 4 ++-- addons/plugin/i18n/sl.po | 4 ++-- addons/plugin/i18n/sv.po | 4 ++-- addons/plugin/i18n/tr.po | 4 ++-- addons/plugin/i18n/zh_CN.po | 4 ++-- addons/plugin/i18n/zh_TW.po | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) (limited to 'addons/plugin') diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po index 462fc04cf6b..7ec3338d41c 100644 --- a/addons/plugin/i18n/ar.po +++ b/addons/plugin/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po index 3178e5491a5..98766cd75d0 100644 --- a/addons/plugin/i18n/cs.po +++ b/addons/plugin/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po index b2f15c2ee14..c7c703635a4 100644 --- a/addons/plugin/i18n/de.po +++ b/addons/plugin/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/es.po b/addons/plugin/i18n/es.po index 956ca801008..1e6529d7c6c 100644 --- a/addons/plugin/i18n/es.po +++ b/addons/plugin/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po index 2ccdd9f2d7d..fd3f816278e 100644 --- a/addons/plugin/i18n/es_CR.po +++ b/addons/plugin/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po index 0578382f8b9..b65e1e37c11 100644 --- a/addons/plugin/i18n/fi.po +++ b/addons/plugin/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po index 06ec814564e..5f11cf14e68 100644 --- a/addons/plugin/i18n/fr.po +++ b/addons/plugin/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/hr.po b/addons/plugin/i18n/hr.po index 808d016efb6..53b22bcd60a 100644 --- a/addons/plugin/i18n/hr.po +++ b/addons/plugin/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/hu.po b/addons/plugin/i18n/hu.po index 35eef1ea4a9..deb6f51f785 100644 --- a/addons/plugin/i18n/hu.po +++ b/addons/plugin/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/it.po b/addons/plugin/i18n/it.po index 53d67d69c27..e6596be8d99 100644 --- a/addons/plugin/i18n/it.po +++ b/addons/plugin/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po index 9575fdbff12..1c4ca7cb4a1 100644 --- a/addons/plugin/i18n/ja.po +++ b/addons/plugin/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/mk.po b/addons/plugin/i18n/mk.po index 9b982e26725..20122226ba1 100644 --- a/addons/plugin/i18n/mk.po +++ b/addons/plugin/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/mn.po b/addons/plugin/i18n/mn.po index 54a84bcbf0d..a6f39d78339 100644 --- a/addons/plugin/i18n/mn.po +++ b/addons/plugin/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/nb.po b/addons/plugin/i18n/nb.po index d2a1dca9f36..ba764200a9e 100644 --- a/addons/plugin/i18n/nb.po +++ b/addons/plugin/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po index d10f0ba165e..eff7800257c 100644 --- a/addons/plugin/i18n/nl.po +++ b/addons/plugin/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po index 9e6131a4814..74c39e2416a 100644 --- a/addons/plugin/i18n/pt.po +++ b/addons/plugin/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po index 78141a8d5a4..21bbe7fdfcc 100644 --- a/addons/plugin/i18n/pt_BR.po +++ b/addons/plugin/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po index 1f80c89cad3..7b679459264 100644 --- a/addons/plugin/i18n/ro.po +++ b/addons/plugin/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/ru.po b/addons/plugin/i18n/ru.po index 0d4d6dad905..ed8b3b05420 100644 --- a/addons/plugin/i18n/ru.po +++ b/addons/plugin/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/sl.po b/addons/plugin/i18n/sl.po index 708916ff16d..462563a24f7 100644 --- a/addons/plugin/i18n/sl.po +++ b/addons/plugin/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po index 453b419083b..f896cd738b9 100644 --- a/addons/plugin/i18n/sv.po +++ b/addons/plugin/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/tr.po b/addons/plugin/i18n/tr.po index 35d9207dbf8..666ca479cd9 100644 --- a/addons/plugin/i18n/tr.po +++ b/addons/plugin/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po index 28d329a1a84..16471741579 100644 --- a/addons/plugin/i18n/zh_CN.po +++ b/addons/plugin/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/i18n/zh_TW.po b/addons/plugin/i18n/zh_TW.po index 7d2af75fa0a..5171d41bd8c 100644 --- a/addons/plugin/i18n/zh_TW.po +++ b/addons/plugin/i18n/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:51+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-28 05:51+0000\n" +"X-Generator: Launchpad (build 16546)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler -- cgit v1.2.3 From 96ad6088540cc4cea5ea656f9350623cfecbc4a5 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 29 Mar 2013 15:37:20 +0100 Subject: [IMP] general: use registry[X] instead registry.get(X) when X is dynamic bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz --- addons/plugin/plugin_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/plugin') diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 0664af1c92e..b4b5064f2b1 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -57,7 +57,7 @@ class plugin_handler(osv.osv_memory): res_id = msg.res_id model = msg.model url = self._make_url(cr, uid, res_id, model) - name = self.pool.get(model).name_get(cr, uid, [res_id])[0][1] + name = self.pool[model].name_get(cr, uid, [res_id])[0][1] return (model,res_id, url,name) def document_type(self, cr, uid, context=None): @@ -81,7 +81,7 @@ class plugin_handler(osv.osv_memory): @return : the result of name_search a list of tuple [(id, 'name')] """ - return self.pool.get(model).name_search(cr, uid, name) + return self.pool[model].name_search(cr, uid, name) def push_message(self, cr, uid, model, email, res_id=0): """ @@ -91,7 +91,7 @@ class plugin_handler(osv.osv_memory): @return Dictionary which contain model , url and resource id. """ mail_message = self.pool.get('mail.message') - model_obj = self.pool.get(model) + model_obj = self.pool[model] msg = self.pool.get('mail.thread').message_parse(cr, uid, email) message_id = msg.get('message-id') mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)]) -- cgit v1.2.3