diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 71d398a46e9..ccd61e04e20 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -383,8 +383,9 @@ class res_partner_address(osv.osv):
 			ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit)
 			if not ids: 
 				ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit)
-			if not ids:
-				ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit)
+			if name:
+				ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit)
+				ids += self.search(cr, user, [('partner_id',operator,name)] + args, limit=limit)
 		return self.name_get(cr, user, ids)
 res_partner_address()
 
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 743d9d8a04d..13fad5b8bd9 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -238,7 +238,6 @@ class rml_parse(object):
 #				else:
 #					self.already[self._node] = 0
 				self._parse_text(self._node.data, level)
-				
 		return True
 
 	def _find_node(self, node, localname):