From c4941feee3cb938ac492980ebb416d33fb6b74e3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 26 Mar 2012 16:49:52 +0200
Subject: [PATCH] [IMP] base_setup, project: move model of project settings
 into project

bzr revid: rco@openerp.com-20120326144952-3gn46dewqi21zdoq
---
 addons/base_setup/base_setup.py |  6 ------
 addons/project/res_config.py    | 15 ++-------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 912bf52bbb1..19c053bae14 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -210,10 +210,4 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
 
-# Preferences wizard for Projects & CRM.
-# It is defined here because it must be inherited independently in modules project and crm_claim.
-class project_config_settings(osv.osv_memory):
-    _name = 'project.config.settings'
-    _inherit = 'res.config.settings'
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 6886dba9c84..d1b6f3f5d32 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -22,7 +22,8 @@
 from osv import osv, fields
 
 class project_configuration(osv.osv_memory):
-    _inherit = 'project.config.settings'
+    _name = 'project.config.settings'
+    _inherit = 'res.config.settings'
 
     _columns = {
         'module_project_mrp': fields.boolean('Create tasks directly from a sale order',
@@ -57,16 +58,4 @@ class project_configuration(osv.osv_memory):
                 This installs the module project_issue_sheet."""),
     }
 
-    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False , type=[]):
-        port = 0
-        values = {}
-        if server_type == 'pop':
-            port = ssl and 995 or 110
-        elif server_type == 'imap':
-            port = ssl and 993 or 143
-        else:
-            values[type+'_server'] = ''
-        values[type+'_port'] = port
-        return {'value': values}
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: