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

[IMP] improved code

Browse Source 
bzr revid: tpa@tinyerp.com-20120314094857-l7kyyzl2cxzezq9x
This commit is contained in:
Turkesh Patel (Open ERP)
2012-03-14 15:18:57 +05:30
parent 69cd8bae3b
commit dbe694c645
4 changed files with 114 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fetchmail/__init__.py
+2 -1
View File
@@ -1,7 +1,7 @@
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# mga@tinyerp.com
#
@@ -21,5 +21,6 @@
##############################################################################
import fetchmail
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/fetchmail/res_config.py
+110
View File
@@ -0,0 +1,110 @@
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# mga@tinyerp.com
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
import pooler
from tools.translate import _
class project_configuration(osv.osv_memory):
_inherit = 'res.config.settings'
def get_default_email_configurations(self, cr, uid, ids, context=None):
fetchmail_obj = self.pool.get('fetchmail.server')
result = {}
issue_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','!=','done')])
if issue_ids:
issue_id = fetchmail_obj.browse(cr, uid, issue_ids[0], context=context)
result.update({'issue_server': issue_id.server})
result.update({'issue_port': issue_id.port})
result.update({'issue_is_ssl': issue_id.is_ssl})
result.update({'issue_type': issue_id.type})
result.update({'issue_user': issue_id.user})
result.update({'issue_password': issue_id.password})
claim_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','!=','done')])
if claim_ids:
claim_id = fetchmail_obj.browse(cr, uid, claim_ids[0], context=context)
result.update({'claim_server': claim_id.server})
result.update({'claim_port': claim_id.port})
result.update({'claim_is_ssl': claim_id.is_ssl})
result.update({'claim_type': claim_id.type})
result.update({'claim_user': claim_id.user})
result.update({'claim_password': claim_id.password})
return result
def set_email_configurations(self, cr, uid, ids, context=None):
model_obj = self.pool.get('ir.model')
fetchmail_obj = self.pool.get('fetchmail.server')
ir_values_obj = self.pool.get('ir.values')
issue_id = model_obj.search(cr, uid, [('model','=','project.issue')])
claim_id = model_obj.search(cr, uid, [('model','=','crm.claim')])
vals = self.read(cr, uid, ids[0], [], context=context)
if vals.get('module_project_issue') and issue_id:
issue_vals = {
'name': 'Incoming Issues',
'object_id': issue_id[0],
'server': vals.get('issue_server'),
'port': vals.get('issue_port'),
'is_ssl': vals.get('issue_is_ssl'),
'type': vals.get('issue_type'),
'user': vals.get('issue_user'),
'password': vals.get('issue_password')
}
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','!=','done')])
if not server_ids:
server_ids = [fetchmail_obj.create(cr, uid, issue_vals, context=context)]
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues')], context=context)
fetchmail_obj.write(cr, uid, server_ids, issue_vals, context=context)
fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None)
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','=','done')])
fetchmail_obj.set_draft(cr, uid, server_ids, context=None)
if vals.get('module_crm_claim') and claim_id:
claim_vals = {
'name': 'Incoming Claims',
'object_id': claim_id[0],
'server': vals.get('claim_server'),
'port': vals.get('claim_port'),
'is_ssl': vals.get('claim_is_ssl'),
'type': vals.get('claim_type'),
'user': vals.get('claim_user'),
'password': vals.get('claim_password')
}
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','!=','done')])
if not server_ids:
server_ids = [fetchmail_obj.create(cr, uid, claim_vals, context=context)]
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims')], context=context)
fetchmail_obj.write(cr, uid, server_ids, claim_vals, context=context)
fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None)
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','=','done')])
fetchmail_obj.set_draft(cr, uid, server_ids, context=None)
project_configuration()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project/res_config.py
-77
View File
@@ -24,7 +24,6 @@ import pooler
from tools.translate import _
class project_configuration(osv.osv_memory):
_name = 'project.configuration'
_inherit = 'res.config.settings'
_columns = {
@@ -91,30 +90,6 @@ class project_configuration(osv.osv_memory):
'claim_type': 'pop',
}
def get_default_email_configurations(self, cr, uid, ids, context=None):
fetchmail_obj = self.pool.get('fetchmail.server')
result = {}
issue_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','!=','done')])
if issue_ids:
issue_id = fetchmail_obj.browse(cr, uid, issue_ids[0], context=context)
result.update({'issue_server': issue_id.server})
result.update({'issue_port': issue_id.port})
result.update({'issue_is_ssl': issue_id.is_ssl})
result.update({'issue_type': issue_id.type})
result.update({'issue_user': issue_id.user})
result.update({'issue_password': issue_id.password})
claim_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','!=','done')])
if claim_ids:
claim_id = fetchmail_obj.browse(cr, uid, claim_ids[0], context=context)
result.update({'claim_server': claim_id.server})
result.update({'claim_port': claim_id.port})
result.update({'claim_is_ssl': claim_id.is_ssl})
result.update({'claim_type': claim_id.type})
result.update({'claim_user': claim_id.user})
result.update({'claim_password': claim_id.password})
return result
def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False , type=[]):
port = 0
@@ -128,58 +103,6 @@ class project_configuration(osv.osv_memory):
values[type+'_port'] = port
return {'value': values}
def set_email_configurations(self, cr, uid, ids, context=None):
model_obj = self.pool.get('ir.model')
fetchmail_obj = self.pool.get('fetchmail.server')
ir_values_obj = self.pool.get('ir.values')
issue_id = model_obj.search(cr, uid, [('model','=','project.issue')])
claim_id = model_obj.search(cr, uid, [('model','=','crm.claim')])
vals = self.read(cr, uid, ids[0], [], context=context)
if vals.get('module_project_issue') and issue_id:
issue_vals = {
'name': 'Incoming Issues',
'object_id': issue_id[0],
'server': vals.get('issue_server'),
'port': vals.get('issue_port'),
'is_ssl': vals.get('issue_is_ssl'),
'type': vals.get('issue_type'),
'user': vals.get('issue_user'),
'password': vals.get('issue_password')
}
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','!=','done')])
if not server_ids:
server_ids = [fetchmail_obj.create(cr, uid, issue_vals, context=context)]
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues')], context=context)
fetchmail_obj.write(cr, uid, server_ids, issue_vals, context=context)
fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None)
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Issues'),('state','=','done')])
fetchmail_obj.set_draft(cr, uid, server_ids, context=None)
if vals.get('module_crm_claim') and claim_id:
claim_vals = {
'name': 'Incoming Claims',
'object_id': claim_id[0],
'server': vals.get('claim_server'),
'port': vals.get('claim_port'),
'is_ssl': vals.get('claim_is_ssl'),
'type': vals.get('claim_type'),
'user': vals.get('claim_user'),
'password': vals.get('claim_password')
}
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','!=','done')])
if not server_ids:
server_ids = [fetchmail_obj.create(cr, uid, claim_vals, context=context)]
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims')], context=context)
fetchmail_obj.write(cr, uid, server_ids, claim_vals, context=context)
fetchmail_obj.button_confirm_login(cr, uid, server_ids, context=None)
else:
server_ids = fetchmail_obj.search(cr, uid, [('name','=','Incoming Claims'),('state','=','done')])
fetchmail_obj.set_draft(cr, uid, server_ids, context=None)
project_configuration()
addons/project/res_config_view.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<record id="view_project_config" model="ir.ui.view">
<field name="name">Project Application</field>
<field name="model">project.configuration</field>
<field name="model">res.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string ="Project Application">
@@ -65,7 +65,7 @@
<record id="action_project_configuration" model="ir.actions.act_window">
<field name="name">Configure Project Application</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">project.configuration</field>
<field name="res_model">res.config.settings</field>
<field name="view_id" ref="view_project_config"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>