diff options
| author | Ravish Murari (OpenERP) <rmu@tinyerp.com> | 2012-08-23 17:16:08 +0530 |
|---|---|---|
| committer | Ravish Murari (OpenERP) <rmu@tinyerp.com> | 2012-08-23 17:16:08 +0530 |
| commit | 05acae2e2fe8b72d7b1523fa0dd91a8e7d2ea09f (patch) | |
| tree | 337084f7e348d9a84e2530c2eb8362a5c966d024 /addons/plugin | |
| parent | c5f7f6ecdf710985f29cc73e310ea1f3852b468d (diff) | |
| parent | 79224ea6722e0f2644239b582d86346f32021c0a (diff) | |
[merge] with latest addons
bzr revid: rmu@tinyerp.com-20120823114608-zerb6vg7l1ckf5mi
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 | 23 | ||||
| -rw-r--r-- | addons/plugin/i18n/fr.po | 4 | ||||
| -rw-r--r-- | addons/plugin/i18n/ja.po | 4 | ||||
| -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/zh_CN.po | 4 | ||||
| -rw-r--r-- | addons/plugin/plugin_handler.py | 11 |
15 files changed, 57 insertions, 36 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..d84383a6e25 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..ccfa49bff6e 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..83b630139de 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..27af6678398 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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 new file mode 100644 index 00000000000..f474abe5cd2 --- /dev/null +++ b/addons/plugin/i18n/fi.po @@ -0,0 +1,23 @@ +# Finnish 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-06-24 12:58+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Finnish <fi@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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "" diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po index 10c5f30904f..31cb793f828 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..7c1222af5ae 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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 e6b5f2149de..a287af98767 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..d158a29d97e 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..b24131afbbb 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..d5fc79dc164 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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..d76e39976ef 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\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 4ff06d80baf..04944f01ff9 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-07 05:39+0000\n" +"X-Generator: Launchpad (build 15745)\n" #. module: plugin #: model:ir.model,name:plugin.model_plugin_handler diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index ef990170e64..e497f902dc2 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -19,15 +19,16 @@ 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): return True def partner_get(self, cr, uid, address_email): - ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '!=', False), ('email', 'like', address_email)]) - res_id = ids and self.pool.get('res.partner.address').browse(cr, uid, ids[0]).partner_id.id or 0 + partner_obj = self.pool.get('res.partner') + partner_ids = partner_obj.search(cr, uid, [('email', 'like', address_email)]) + res_id = partner_ids and partner_ids[0] or 0 url = self._make_url(cr, uid, res_id, 'res.partner') return ('res.partner', res_id , url) @@ -116,7 +117,7 @@ class plugin_handler(osv.osv_memory): def contact_create(self, cr, uid, data, partner_id): """ - @param data : the data use to create the res.partner.address + @param data : the data use to create the res.partner [('field_name', value)], field name is required @param partner_id : On which partner the address is attached if partner_id = 0 then create a new partner with the same name that the address @@ -127,7 +128,7 @@ class plugin_handler(osv.osv_memory): if partner_id == 0: partner_id = partner_obj.create(cr, uid, {'name':dictcreate.get('name')}) dictcreate['partner_id'] = partner_id - self.pool.get('res.partner.address').create(cr, uid, dictcreate) + self.pool.get('res.partner').create(cr, uid, dictcreate) url = self._make_url(cr, uid, partner_id, 'res.partner') return ('res.partner', partner_id, url) |
