diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 808b66557ec..ddfdb05ca66 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -87,8 +87,8 @@ class crm_lead(base_stage, osv.osv): search_domain = [] section_id = self._resolve_section_id_from_context(cr, uid, context=context) if section_id: - search_domain += ['|', '&', ('section_ids', '=', section_id), ('fold', '=', False)] - search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)] + search_domain += ['|', ('section_ids', '=', section_id)] + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] # retrieve type from the context (if set: choose 'type' or 'both') type = self._resolve_type_from_context(cr, uid, context=context) if type: diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 3401670d6eb..2748834ae9a 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -131,8 +131,8 @@ class hr_applicant(base_stage, osv.Model): department_id = self._resolve_department_id_from_context(cr, uid, context=context) search_domain = [] if department_id: - search_domain += ['|', '&', ('department_id', '=', department_id), ('fold', '=', False)] - search_domain += ['|', ('id', 'in', ids), '&', ('department_id', '=', False), ('fold', '=', False)] + search_domain += ['|', ('department_id', '=', department_id)] + search_domain += ['|', ('id', 'in', ids), ('department_id', '=', False)] stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) # restore order of the search diff --git a/addons/note/note.py b/addons/note/note.py index 61b5caeff8d..abc7dca297e 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -64,7 +64,7 @@ class note_note(osv.osv): stage_obj = self.pool.get('note.stage') # only show stage groups not folded and owned by user - search_domain = [('fold', '=', False),('user_id', '=', uid)] + search_domain = [('user_id', '=', uid)] stage_ids = stage_obj._search(cr, uid, search_domain, order=self._order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) diff --git a/addons/project/project.py b/addons/project/project.py index 8e624c42595..9bd939dd4fe 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -582,8 +582,8 @@ class task(base_stage, osv.osv): search_domain = [] project_id = self._resolve_project_id_from_context(cr, uid, context=context) if project_id: - search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)] - search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)] + search_domain += ['|', ('project_ids', '=', project_id)] + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) # restore order of the search diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 8031a9dc88d..6121acbd607 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -87,8 +87,8 @@ class project_issue(base_stage, osv.osv): search_domain = [] project_id = self._resolve_project_id_from_context(cr, uid, context=context) if project_id: - search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)] - search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)] + search_domain += ['|', ('project_ids', '=', project_id)] + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] # perform search stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context) result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)