From e2183df759bd724cc696ca95ccc43e63733ccba4 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Fri, 18 Mar 2011 14:32:34 +0530 Subject: [PATCH] [IMP]: ADD Host choice and rename module to Import_sugarcrm bzr revid: atp@tinyerp.com-20110318090234-0r4ci3o5a3eqjmm0 --- addons/{sugarcrm_syncro => import_sugarcrm}/__init__.py | 0 .../{sugarcrm_syncro => import_sugarcrm}/__openerp__.py | 2 +- .../import_sugarcrm.py | 6 +++--- .../import_sugarcrm_view.xml | 2 +- addons/{sugarcrm_syncro => import_sugarcrm}/sugar.py | 4 ++-- .../sugarcrm_fields_mapping.py | 0 .../sugarsoap_services.py | 0 .../sugarsoap_services_types.py | 0 .../wizard/__init__.py | 0 .../wizard/import_message.py | 0 .../wizard/import_message_view.xml | 0 .../wizard/sugarcrm_login.py | 8 +++++--- .../wizard/sugarcrm_login_view.xml | 4 +++- 13 files changed, 15 insertions(+), 11 deletions(-) rename addons/{sugarcrm_syncro => import_sugarcrm}/__init__.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/__openerp__.py (95%) rename addons/{sugarcrm_syncro => import_sugarcrm}/import_sugarcrm.py (98%) rename addons/{sugarcrm_syncro => import_sugarcrm}/import_sugarcrm_view.xml (96%) rename addons/{sugarcrm_syncro => import_sugarcrm}/sugar.py (96%) rename addons/{sugarcrm_syncro => import_sugarcrm}/sugarcrm_fields_mapping.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/sugarsoap_services.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/sugarsoap_services_types.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/wizard/__init__.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/wizard/import_message.py (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/wizard/import_message_view.xml (100%) rename addons/{sugarcrm_syncro => import_sugarcrm}/wizard/sugarcrm_login.py (87%) rename addons/{sugarcrm_syncro => import_sugarcrm}/wizard/sugarcrm_login_view.xml (89%) diff --git a/addons/sugarcrm_syncro/__init__.py b/addons/import_sugarcrm/__init__.py similarity index 100% rename from addons/sugarcrm_syncro/__init__.py rename to addons/import_sugarcrm/__init__.py diff --git a/addons/sugarcrm_syncro/__openerp__.py b/addons/import_sugarcrm/__openerp__.py similarity index 95% rename from addons/sugarcrm_syncro/__openerp__.py rename to addons/import_sugarcrm/__openerp__.py index 9e7a7435f87..55dad57d529 100644 --- a/addons/sugarcrm_syncro/__openerp__.py +++ b/addons/import_sugarcrm/__openerp__.py @@ -23,7 +23,7 @@ 'name': 'Import SugarCRM Data into OpenERP Module.', 'version': '1.0', 'category': 'Generic Modules', - 'description': """This Module Import SugarCRM "Leads", "Opportunity", "Accounts" and "contacts" Data into OpenERP Module.""", + 'description': """This Module Import SugarCRM "Leads", "Opportunities", and "Users" Data into OpenERP Module.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['crm'], diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py similarity index 98% rename from addons/sugarcrm_syncro/import_sugarcrm.py rename to addons/import_sugarcrm/import_sugarcrm.py index 6c7b3fe3cc4..04744ea7e88 100644 --- a/addons/sugarcrm_syncro/import_sugarcrm.py +++ b/addons/import_sugarcrm/import_sugarcrm.py @@ -52,7 +52,7 @@ def import_users(sugar_obj, cr, uid, context=None): '.id' : '.id', } user_obj = sugar_obj.pool.get('res.users') - PortType,sessionid = sugar.login(context.get('username',''), context.get('password','')) + PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''), context.get('url','')) sugar_data = sugar.search(PortType,sessionid, 'Users') for val in sugar_data: user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))]) @@ -130,7 +130,7 @@ def import_leads(sugar_obj, cr, uid, context=None): } lead_obj = sugar_obj.pool.get('crm.lead') - PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', '')) + PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''), context.get('url','')) sugar_data = sugar.search(PortType, sessionid, 'Leads') for val in sugar_data: val['type'] = 'lead' @@ -152,7 +152,7 @@ def import_opportunities(sugar_obj, cr, uid, context=None): 'type' : 'type', } lead_obj = sugar_obj.pool.get('crm.lead') - PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', '')) + PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''), context.get('url','')) sugar_data = sugar.search(PortType, sessionid, 'Opportunities') for val in sugar_data: val['type'] = 'opportunity' diff --git a/addons/sugarcrm_syncro/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml similarity index 96% rename from addons/sugarcrm_syncro/import_sugarcrm_view.xml rename to addons/import_sugarcrm/import_sugarcrm_view.xml index 26a3b259140..1c25637228d 100644 --- a/addons/sugarcrm_syncro/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -9,7 +9,7 @@ form
- + diff --git a/addons/sugarcrm_syncro/sugar.py b/addons/import_sugarcrm/sugar.py similarity index 96% rename from addons/sugarcrm_syncro/sugar.py rename to addons/import_sugarcrm/sugar.py index 6e9835823ee..7bba370f812 100644 --- a/addons/sugarcrm_syncro/sugar.py +++ b/addons/import_sugarcrm/sugar.py @@ -29,10 +29,10 @@ import sys; class LoginError(Exception): pass -def login(username, password): +def login(username, password, url): loc = sugarsoapLocator() - portType = loc.getsugarsoapPortType() + portType = loc.getsugarsoapPortType(url) request = loginRequest() uauth = ns0.user_auth_Def(request) request._user_auth = uauth diff --git a/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py b/addons/import_sugarcrm/sugarcrm_fields_mapping.py similarity index 100% rename from addons/sugarcrm_syncro/sugarcrm_fields_mapping.py rename to addons/import_sugarcrm/sugarcrm_fields_mapping.py diff --git a/addons/sugarcrm_syncro/sugarsoap_services.py b/addons/import_sugarcrm/sugarsoap_services.py similarity index 100% rename from addons/sugarcrm_syncro/sugarsoap_services.py rename to addons/import_sugarcrm/sugarsoap_services.py diff --git a/addons/sugarcrm_syncro/sugarsoap_services_types.py b/addons/import_sugarcrm/sugarsoap_services_types.py similarity index 100% rename from addons/sugarcrm_syncro/sugarsoap_services_types.py rename to addons/import_sugarcrm/sugarsoap_services_types.py diff --git a/addons/sugarcrm_syncro/wizard/__init__.py b/addons/import_sugarcrm/wizard/__init__.py similarity index 100% rename from addons/sugarcrm_syncro/wizard/__init__.py rename to addons/import_sugarcrm/wizard/__init__.py diff --git a/addons/sugarcrm_syncro/wizard/import_message.py b/addons/import_sugarcrm/wizard/import_message.py similarity index 100% rename from addons/sugarcrm_syncro/wizard/import_message.py rename to addons/import_sugarcrm/wizard/import_message.py diff --git a/addons/sugarcrm_syncro/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml similarity index 100% rename from addons/sugarcrm_syncro/wizard/import_message_view.xml rename to addons/import_sugarcrm/wizard/import_message_view.xml diff --git a/addons/sugarcrm_syncro/wizard/sugarcrm_login.py b/addons/import_sugarcrm/wizard/sugarcrm_login.py similarity index 87% rename from addons/sugarcrm_syncro/wizard/sugarcrm_login.py rename to addons/import_sugarcrm/wizard/sugarcrm_login.py index 0ebb68cb020..e63574a5513 100644 --- a/addons/sugarcrm_syncro/wizard/sugarcrm_login.py +++ b/addons/import_sugarcrm/wizard/sugarcrm_login.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv from tools.translate import _ -from sugarcrm_syncro import sugar +from import_sugarcrm import sugar class sugarcrm_login(osv.osv): """SugarCRM Login""" @@ -30,23 +30,25 @@ class sugarcrm_login(osv.osv): _columns = { 'username': fields.char('User Name', size=64, required=True), 'password': fields.char('Password', size=24,required=True), + 'url' : fields.char('SugarCRM Path', size=264, required=True, help="Path for SugarCRM connection should be 'http://localhost/sugarcrm/soap.php' Format."), } _defaults = { 'username' : 'admin', 'password' : 'admin', + 'url': "http://localhost/sugarcrm/soap.php" } def open_import(self, cr, uid, ids, context=None): for current in self.browse(cr, uid, ids, context): - PortType,sessionid = sugar.login(current.username, current.password) + PortType,sessionid = sugar.login(current.username, current.password, current.url) if sessionid == '-1': raise osv.except_osv(_('Error !'), _('Authentication error !\nBad Username or Password !')) obj_model = self.pool.get('ir.model.data') model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.sugarcrm.form')]) resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id']) - context.update({'rec_id': ids, 'username': current.username, 'password': current.password}) + context.update({'rec_id': ids, 'username': current.username, 'password': current.password, 'url': current.url}) return { 'view_type': 'form', 'view_mode': 'form', diff --git a/addons/sugarcrm_syncro/wizard/sugarcrm_login_view.xml b/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml similarity index 89% rename from addons/sugarcrm_syncro/wizard/sugarcrm_login_view.xml rename to addons/import_sugarcrm/wizard/sugarcrm_login_view.xml index 1e0cc0306c9..4cb8fe98ab6 100644 --- a/addons/sugarcrm_syncro/wizard/sugarcrm_login_view.xml +++ b/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml @@ -9,7 +9,9 @@ form - + + +