Bugfixes
BVR bzr revid: pinky-c093d6ad7a93529a8963cc53c2ae925eab0d8a9c
This commit is contained in:
parent
52c46a3d24
commit
f242d47b82
|
@ -383,8 +383,9 @@ class res_partner_address(osv.osv):
|
||||||
ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit)
|
ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit)
|
||||||
if not ids:
|
if not ids:
|
||||||
ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit)
|
ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit)
|
||||||
if not ids:
|
if name:
|
||||||
ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit)
|
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)
|
return self.name_get(cr, user, ids)
|
||||||
res_partner_address()
|
res_partner_address()
|
||||||
|
|
||||||
|
|
|
@ -238,7 +238,6 @@ class rml_parse(object):
|
||||||
# else:
|
# else:
|
||||||
# self.already[self._node] = 0
|
# self.already[self._node] = 0
|
||||||
self._parse_text(self._node.data, level)
|
self._parse_text(self._node.data, level)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _find_node(self, node, localname):
|
def _find_node(self, node, localname):
|
||||||
|
|
Loading…
Reference in New Issue