From 70a1ed47d317a3e4193cd5a374e28860244d3f68 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 21 May 2012 15:58:56 +0200 Subject: [PATCH] [IMP] Removing context_XXX_id for default searches; replaced by save as default search in the new search widget bzr revid: fp@tinyerp.com-20120521135856-hc0kzrpgrxozpq9r --- addons/crm/crm.py | 21 +----------------- addons/crm/crm_view.xml | 26 ---------------------- addons/hr/hr_department.py | 9 -------- addons/hr/hr_department_view.xml | 22 ------------------ addons/import_sugarcrm/import_sugarcrm.py | 1 - addons/project/project.py | 7 ------ addons/project/project_view.xml | 27 +---------------------- addons/project_issue/project_issue.py | 7 ------ 8 files changed, 2 insertions(+), 118 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 467ea64e633..8ab1e6e4ef0 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -224,10 +224,7 @@ class crm_base(object): return uid def _get_section(self, cr, uid, context=None): - """Gives section id for current User - """ - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - return user.context_section_id.id or False + return False def onchange_partner_address_id(self, cr, uid, ids, add, email=False): """This function returns value of partner email based on Partner Address @@ -605,20 +602,4 @@ def _links_get(self, cr, uid, context=None): res = obj.read(cr, uid, ids, ['object', 'name'], context) return [(r['object'], r['name']) for r in res] -class users(osv.osv): - _inherit = 'res.users' - _description = "Users" - _columns = { - 'context_section_id': fields.many2one('crm.case.section', 'Sales Team'), - } - - def create(self, cr, uid, vals, context=None): - res = super(users, self).create(cr, uid, vals, context=context) - section_obj=self.pool.get('crm.case.section') - if vals.get('context_section_id'): - section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context) - return res - -users() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 22f999188e7..dd24ef38911 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -376,32 +376,6 @@ groups="base.group_no_one" sequence="15" parent="base.menu_base_config" /> - - view.users.form.crm.modif.inherited1 - res.users - - form - - - - - - - - - view.users.form.crm.modif.inherited2 - res.users - form - - - - - - - - - diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py index 3332207cb17..e0ad03721d6 100644 --- a/addons/hr/hr_department.py +++ b/addons/hr/hr_department.py @@ -105,14 +105,5 @@ class ir_action_window(osv.osv): ir_action_window() -class res_users(osv.osv): - _inherit = 'res.users' - _description = 'User' - - _columns = { - 'context_department_id': fields.many2one('hr.department', 'Departments'), - } - -res_users() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index 0171b41e881..0a66fd478b9 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -57,27 +57,5 @@ - - res.users.form - form - res.users - - - - - - - - - view.department.form.hr.inherited1 - res.users - - form - - - - - - diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py index 3ff14bcf1c7..11d3c26a207 100644 --- a/addons/import_sugarcrm/import_sugarcrm.py +++ b/addons/import_sugarcrm/import_sugarcrm.py @@ -898,7 +898,6 @@ class sugar_import(import_framework): 'context_lang' : 'context_lang', 'password' : 'password', '.id' : '.id', - 'context_department_id/id': self.get_users_department, 'user_email' : 'email1', } } diff --git a/addons/project/project.py b/addons/project/project.py index 10ab7987774..7c8b3462668 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -504,13 +504,6 @@ def Project(): project() -class users(osv.osv): - _inherit = 'res.users' - _columns = { - 'context_project_id': fields.many2one('project.project', 'Project') - } -users() - class task(osv.osv): _name = "project.task" _description = "Task" diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 6266258046c..344942cb3d5 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -745,31 +745,6 @@ - - res.users.project.form1 - res.users - form - - - - - - - - - - - view.users.form.project.modif.inherited1 - res.users - - form - - - - - - - - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 5a792ac4d28..1b208bc3796 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -140,12 +140,6 @@ class project_issue(crm.crm_case, osv.osv): res[issue.id] = {'progress' : progress} return res - def _get_project(self, cr, uid, context=None): - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - if user.context_project_id: - return user.context_project_id.id - return False - def on_change_project(self, cr, uid, ids, project_id, context=None): return {} @@ -233,7 +227,6 @@ class project_issue(crm.crm_case, osv.osv): 'section_id': crm.crm_case._get_section, 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 'priority': crm.AVAILABLE_PRIORITIES[2][0], - 'project_id':_get_project, 'categ_id' : lambda *a: False, }