From b06e457eb716186e313d6ff3887430b595d151ac Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Thu, 23 Feb 2012 16:25:53 +0530 Subject: [PATCH] [IMP]: Modified view of sales configuration. bzr revid: uco@tinyerp.com-20120223105553-gkjlqq129bbcoig3 --- openerp/addons/base/res/res_config_sale.py | 26 +++++++++++++++ .../addons/base/res/res_config_sale_view.xml | 33 ++++++++++++++----- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/res/res_config_sale.py b/openerp/addons/base/res/res_config_sale.py index d3ae0ce8931..ba70c9d75e5 100644 --- a/openerp/addons/base/res/res_config_sale.py +++ b/openerp/addons/base/res/res_config_sale.py @@ -67,12 +67,38 @@ class sale_config_picking_policy(osv.osv_memory): 'wiki_sale_faq' : fields.boolean("Install a sales FAQ?"), 'crm_partner_assign' : fields.boolean("Manage a several address per customer"), 'google_map' : fields.boolean("Google maps on customer"), + 'create_leads': fields.boolean("Create Leads from an Email Account"), + 'server' : fields.char('Server Name', size=256, required=True), + 'port' : fields.integer('Port', required=True), + 'type':fields.selection([ + ('pop', 'POP Server'), + ('imap', 'IMAP Server'), + ('local', 'Local Server'), + ], 'Server Type', required=True), + 'is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"), + 'user' : fields.char('Username', size=256, required=True), + 'password' : fields.char('Password', size=1024, required=True), + 'plugin_thunderbird': fields.boolean('Push your email from Thunderbird to an OpenERP document'), + 'plugin_outlook': fields.boolean('Push your email from Outlook to an OpenERP document'), } _defaults = { 'order_policy': 'manual', 'tax_policy': 'no_tax', + 'type': 'pop', } + + def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False): + 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['server'] = '' + values['port'] = port + return {'value':values} def onchange_order(self, cr, uid, ids, sale, deli, context=None): res = {} diff --git a/openerp/addons/base/res/res_config_sale_view.xml b/openerp/addons/base/res/res_config_sale_view.xml index 87e34b1be66..f57f5bc6d0e 100644 --- a/openerp/addons/base/res/res_config_sale_view.xml +++ b/openerp/addons/base/res/res_config_sale_view.xml @@ -31,7 +31,6 @@ - @@ -62,7 +61,6 @@ - @@ -71,9 +69,31 @@ + + + + + + + + + + + + + + + + + + + + + + + - @@ -89,7 +109,6 @@ - @@ -99,7 +118,6 @@ - @@ -109,7 +127,6 @@ - @@ -120,8 +137,8 @@ -