diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-08-13 14:08:01 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-08-13 14:08:01 +0200 |
| commit | 4c3e048d4083893c51ce3071c6298e0301f34fb7 (patch) | |
| tree | 42c42757d5eda0963554f36d434e282fc8e4f79a /addons/plugin/plugin_handler.py | |
| parent | 8759e49b8355eec82709aee70405ecc86f20be3b (diff) | |
| parent | 01dc1b218b2165973914938ee37bcf1b855addf5 (diff) | |
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
Diffstat (limited to 'addons/plugin/plugin_handler.py')
| -rw-r--r-- | addons/plugin/plugin_handler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index 700b9648237..e497f902dc2 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): |