summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-09 10:52:45 +0530
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-08-09 10:52:45 +0530
commit374b834d9a689a1a9a19bc5fd1cc1e2ed7e04bca (patch)
tree830fddd3d30195eb8e9e31c7b4ff420ce545d7db /addons/plugin/plugin_handler.py
parent0e77a7cbda6ea1e7500c42b84f741c5ecbd48a4e (diff)
parente970ecd62cb627a33832a561a082d211ab9923c7 (diff)
[MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120809052245-638xhf0oyjtnhcak
Diffstat (limited to 'addons/plugin/plugin_handler.py')
-rw-r--r--addons/plugin/plugin_handler.py2
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):