diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-29 17:57:17 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-29 17:57:17 +0530 |
| commit | 7c6f6e89b5f07d42c7fe0aedd55e6a32ebbe66f5 (patch) | |
| tree | 3e70511c6e273aa899c562086e3924c85c54ac3d /addons/plugin | |
| parent | fe128d7498491ef2e67270e2dc03740699b68310 (diff) | |
| parent | 814a121dabbbe45a1c9ee671222b3a2bf261059a (diff) | |
[MERGE] merge with latest trunk
bzr revid: vja@tinyerp.com-20130429093627-cpxq3uybwsssrqr5
bzr revid: vja@tinyerp.com-20130430115558-p1aw1zszcur21fj5
bzr revid: vja@tinyerp.com-20130517054712-9o7u266nfm8atgjv
bzr revid: amb@tinyerp.com-20130529122717-lpk7tn30qek2i5yt
Diffstat (limited to 'addons/plugin')
| -rw-r--r-- | addons/plugin/i18n/lt.po | 23 | ||||
| -rw-r--r-- | addons/plugin/plugin_handler.py | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/addons/plugin/i18n/lt.po b/addons/plugin/i18n/lt.po new file mode 100644 index 00000000000..dc120cadcf2 --- /dev/null +++ b/addons/plugin/i18n/lt.po @@ -0,0 +1,23 @@ +# Lithuanian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-04-24 18:14+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Lithuanian <lt@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: 2013-04-25 05:20+0000\n" +"X-Generator: Launchpad (build 16580)\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 c278db2f19a..fc6c874fab5 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -110,7 +110,7 @@ class plugin_handler(osv.osv_memory): model_obj.message_post(cr, uid, [res_id], body=msg.get('body'), subject=msg.get('subject'), - type='email', + type='comment' if model == 'res.partner' else 'email', parent_id=msg.get('parent_id'), attachments=msg.get('attachments')) notify = _("Mail successfully pushed") |