diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ba073060456..f7d56ce373b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            'test/ui/demo_data.yml',
+            #'test/ui/demo_data.yml', TODO : After installing crm_partner_assign view error  
             'test/ui/duplicate_lead.yml',
             'test/ui/delete_lead.yml'
              ],
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 2ec3c85353b..7cf47b95939 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -27,7 +27,7 @@
                                 <field name="partner_latitude"/>
                                 <field name="partner_longitude"/>
                                 <group colspan="1" col="1">
-                                    <button string="Geo Assign" name="assign_partner" type="object" colspan="1"
+                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
                                         icon="gtk-apply"/>
                                 </group>
                             </group>
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 14e15959a3d..89f04c3216b 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -118,6 +118,9 @@ class crm_lead(osv.osv):
                          'user_id' : user_id}
                    }
 
+    def action_assign_partner(self, cr, uid, ids, context=None):
+        return self.assign_partner(cr, uid, ids, partner_id=False, context=context)
+
     def assign_partner(self, cr, uid, ids, partner_id=False, context=None):
         partner_ids = {}
         res = False
@@ -127,6 +130,9 @@ class crm_lead(osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if not partner_id:
                 partner_id = partner_ids.get(lead.id, False)
+            if not partner_id:
+                continue
+            self.assign_geo_localize(cr, uid, [lead.id], lead.partner_latitude, lead.partner_longitude, context=context)
             partner = res_partner.browse(cr, uid, partner_id, context=context)
             if partner.user_id:
                 for lead_id in ids:
@@ -188,7 +194,7 @@ class crm_lead(osv.osv):
                 # 5. fifth way: anywhere in same country
                 if not partner_ids:
                     # still haven't found any, let's take all partners in the country!
-                    partner_ids = partner.search(cr, uid, [
+                    partner_ids = res_partner.search(cr, uid, [
                         ('partner_weight', '>', 0),
                         ('country', '=', lead.country_id.id),
                     ], context=context)