pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

account,account_report,base,product,scrum,stock,kernel: fix name_search

Browse Source 
- add limit
- use context for the search
- fix mutable default args

bzr revid: ced-16b45131f168656508b7a570d11802a1e1b245e7
This commit is contained in:
ced
2007-07-26 08:31:51 +00:00
parent f0b3162c59
commit 556296cb2e
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/res/partner/partner.py
+27 -15
View File
@@ -55,11 +55,15 @@ class res_country(osv.osv):
('name_uniq', 'unique (name)', 'The name of the country must be unique !'),
('code_uniq', 'unique (code)', 'The code of the country must be unique !')
]
def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
ids = self.search(cr, user, [('code','=',name)]+ args)
def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
if not args:
args=[]
if not context:
context={}
ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
if not ids:
ids = self.search(cr, user, [('name',operator,name)]+ args)
return self.name_get(cr, user, ids)
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
return self.name_get(cr, user, ids, context)
_order='code'
res_country()
@@ -237,13 +241,17 @@ class res_partner(osv.osv):
res = [(r['id'], r[rec_name]) for r in self.read(cr, uid, ids, [rec_name], context)]
return res
def name_search(self, cr, uid, name, args=[], operator='ilike', context={}, limit=80):
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
if not args:
args=[]
if not context:
context={}
if name:
ids = self.search(cr, uid, [('ref', '=', name)] + args, limit=limit)
ids = self.search(cr, uid, [('ref', '=', name)] + args, limit=limit, context=context)
if not ids:
ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit)
ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
else:
ids = self.search(cr, uid, args, limit=limit)
ids = self.search(cr, uid, args, limit=limit, context=context)
return self.name_get(cr, uid, ids, context)
def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):
@@ -342,17 +350,21 @@ class res_partner_address(osv.osv):
res.append((r['id'], addr or '/'))
return res
def name_search(self, cr, user, name, args=[], operator='ilike', context={}, limit=80):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
if not args:
args=[]
if not context:
context={}
if context.get('contact_display', 'contact')=='partner':
ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit)
ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
else:
ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit)
ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit, context=context)
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, context=context)
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)
ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
ids += self.search(cr, user, [('partner_id',operator,name)] + args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
res_partner_address()
class res_partner_bank_type(osv.osv):
bin/addons/base/res/res_user.py
+7 -3
View File
@@ -120,10 +120,14 @@ class users(osv.osv):
raise osv.except_osv('Can not remove root user !', 'You can not remove the root user as it is used internally for resources created by Tiny ERP (updates, module installation, ...)')
return super(users, self).unlink(cr, uid, ids)
def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
ids = self.search(cr, user, [('login','=',name)]+ args)
def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
if not args:
args=[]
if not context:
context={}
ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
if not ids:
ids = self.search(cr, user, [('name',operator,name)]+ args)
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids)
def copy(self, cr, uid, id, default=None, context={}):
bin/osv/orm.py
+1 -1
View File
@@ -1698,7 +1698,7 @@ class orm(object):
args=args[:]
if name:
args += [(self._rec_name,operator,name)]
ids = self.search(cr, user, args, limit=limit)
ids = self.search(cr, user, args, limit=limit, context=context)
res = self.name_get(cr, user, ids, context)
return res