[MERGE]: Merge with lp:openobject-addons

bzr revid: jir@tinyerp.com-20120824093240-xu2vnw5pfnlt3437

1 files changed, 6 insertions, 5 deletions

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)