diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-09-11 16:05:07 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-09-11 16:05:07 +0200 |
| commit | daa2b3e813f14421d25921944d9dd412a4c2d114 (patch) | |
| tree | 6739c5b63f80e3aee54901a89085fb316f3e573c /addons/plugin | |
| parent | b0e6046f73d616fb8b940773afd15319c9b78cce (diff) | |
| parent | 6c8c793fd9b4b6120beff0935d872d6591f537ad (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120911140507-1cizcowa4xewvqf8
Diffstat (limited to 'addons/plugin')
| -rw-r--r-- | addons/plugin/__openerp__.py | 9 | ||||
| -rw-r--r-- | addons/plugin/i18n/ar.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/cs.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/de.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/es_CR.po | 6 | ||||
| -rw-r--r-- | addons/plugin/i18n/fi.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/fr.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/ja.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/mn.po | 23 | ||||
| -rw-r--r-- | addons/plugin/i18n/nb.po | 23 | ||||
| -rw-r--r-- | addons/plugin/i18n/nl.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/pt.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/pt_BR.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/ro.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/sv.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/tr.po | 23 | ||||
| -rw-r--r-- | addons/plugin/i18n/zh_CN.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/zh_TW.po | 23 | ||||
| -rw-r--r-- | addons/plugin/plugin_handler.py | 21 |
19 files changed, 132 insertions, 44 deletions
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py index dba41649ff6..7af31450a87 100644 --- a/addons/plugin/__openerp__.py +++ b/addons/plugin/__openerp__.py @@ -25,15 +25,12 @@ 'version': '1.0', 'category': 'Hidden/Dependency', 'description': """ -The common interface for pugin. -===================================================== - +The common interface for plug-in. +================================= """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': [ - 'base', - ], + 'depends': ['base'], 'data': [], 'demo': [], 'test': [], diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po index 4047918f385..b1f7b0493b6 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: 2012-04-07 04:56+0000\n" -"X-Generator: Launchpad (build 15060)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 2991dd9970a..f111194587c 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: 2012-04-07 04:56+0000\n" -"X-Generator: Launchpad (build 15060)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 e11c7548e01..5a58bfe4530 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: 2012-02-10 04:50+0000\n" -"X-Generator: Launchpad (build 14771)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 f42de440a47..d098e9119a3 100644 --- a/addons/plugin/i18n/es_CR.po +++ b/addons/plugin/i18n/es_CR.po @@ -9,13 +9,13 @@ msgstr "" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" "PO-Revision-Date: 2012-02-17 20:49+0000\n" -"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n" +"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n" "Language-Team: Spanish (Costa Rica) <es_CR@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: 2012-02-18 05:00+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 14830e380bf..34bfb60ed62 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: 2012-06-25 05:15+0000\n" -"X-Generator: Launchpad (build 15482)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 10c5f30904f..6022403f59a 100644 --- a/addons/plugin/i18n/fr.po +++ b/addons/plugin/i18n/fr.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n" -"X-Generator: Launchpad (build 15288)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 7482a0eef84..0ee81d3bac4 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: 2012-04-30 04:41+0000\n" -"X-Generator: Launchpad (build 15171)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 new file mode 100644 index 00000000000..39484117214 --- /dev/null +++ b/addons/plugin/i18n/mn.po @@ -0,0 +1,23 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-08-24 06:21+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Mongolian <mn@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: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "plugin.handler" diff --git a/addons/plugin/i18n/nb.po b/addons/plugin/i18n/nb.po new file mode 100644 index 00000000000..0ef79314ec0 --- /dev/null +++ b/addons/plugin/i18n/nb.po @@ -0,0 +1,23 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-09-10 13:40+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Norwegian Bokmal <nb@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: 2012-09-11 04:50+0000\n" +"X-Generator: Launchpad (build 15924)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "Plugg.behandleren" diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po index e6b5f2149de..a8f4531f14b 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: 2012-02-15 05:27+0000\n" -"X-Generator: Launchpad (build 14781)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 efc1467c3b2..bc63e11c5f0 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: 2012-05-24 11:09+0000\n" -"X-Generator: Launchpad (build 15288)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 3dad6e326c5..99e046c4de6 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: 2012-02-17 05:01+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 3ce1bc7834c..8a17e29d6b2 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: 2012-05-11 05:15+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 6d33164d1c4..93341a27321 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: 2012-06-05 04:54+0000\n" -"X-Generator: Launchpad (build 15353)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 new file mode 100644 index 00000000000..d51e6a4acd3 --- /dev/null +++ b/addons/plugin/i18n/tr.po @@ -0,0 +1,23 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-08-21 19:51+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Turkish <tr@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: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "eklenti.işlemci" diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po index 4ff06d80baf..a874e49b529 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: 2012-02-15 05:27+0000\n" -"X-Generator: Launchpad (build 14781)\n" +"X-Launchpad-Export-Date: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\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 new file mode 100644 index 00000000000..7b8f20da8cf --- /dev/null +++ b/addons/plugin/i18n/zh_TW.po @@ -0,0 +1,23 @@ +# Chinese (Traditional) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-08-21 06:38+0000\n" +"Last-Translator: Eric Huang <eh@cenoq.com>\n" +"Language-Team: Chinese (Traditional) <zh_TW@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: 2012-08-28 06:43+0000\n" +"X-Generator: Launchpad (build 15864)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "plugin.handler" diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 700b9648237..9c582a8e3bf 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -19,7 +19,7 @@ class plugin_handler(osv.osv_memory): base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context) if base_url: user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - base_url += '/web/webclient/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model) + base_url += '/login?db=%s&login=%s&key=%s#id=%s&model=%s' % (cr.dbname, user.login, user.password, res_id, model) return base_url def is_installed(self, cr, uid): @@ -44,7 +44,7 @@ class plugin_handler(osv.osv_memory): res_id = 0 url = "" name = "" - msg = mail_message_obj.parse_message(email) + msg = self.pool.get('mail.thread').parse_message(cr, uid, email) references = [msg.get('message-id')] refs = msg.get('references',False) if refs: @@ -91,7 +91,7 @@ class plugin_handler(osv.osv_memory): """ mail_message = self.pool.get('mail.message') model_obj = self.pool.get(model) - msg = mail_message.parse_message(email) + msg = self.pool.get('mail.thread').parse_message(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)]) @@ -101,16 +101,15 @@ class plugin_handler(osv.osv_memory): notify = "Email already pushed" elif res_id == 0: if model == 'res.partner': - notify = 'User the button Partner to create a new partner' + notify = 'User the Partner button to create a new partner' else: res_id = model_obj.message_new(cr, uid, msg) - notify = "Mail succefully pushed, a new %s has been created " % model + notify = "Mail succesfully pushed, a new %s has been created " % model else: if model == 'res.partner': model_obj = self.pool.get('mail.thread') - res = self.pool.get(model).browse(cr, uid, [res_id]) - model_obj.message_append_dict(cr, uid, res, msg) - notify = "Mail succefully pushed" + model_obj.message_post(cr, uid, [res_id], body=msg) + notify = "Mail succesfully pushed" url = self._make_url(cr, uid, res_id, model) return (model, res_id, url, notify) @@ -133,7 +132,7 @@ class plugin_handler(osv.osv_memory): return ('res.partner', partner_id, url) # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts - def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False): + def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body=False, body_html=False, attachments=False): # ---------------------------------------- # solution 1 # construct a fake rfc822 from the separated arguement @@ -147,7 +146,7 @@ class plugin_handler(osv.osv_memory): mail_message = self.pool.get('mail.message') ir_attachment_obj = self.pool.get('ir.attachment') attach_ids = [] - msg = mail_message.parse_message(headers) + msg = self.pool.get('mail.thread').parse_message(cr, uid, headers) message_id = msg.get('message-id') push_mail = self.push_message(cr, uid, model, headers, res_id) res_id = push_mail[1] @@ -161,6 +160,6 @@ class plugin_handler(osv.osv_memory): attach_ids.append(ir_attachment_obj.create(cr, uid, vals)) mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)]) if mail_ids: - ids = mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html}) + 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) |
