Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs2_correction_importcrm-atp into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm

  1. trunk-import_sugarcrm-backlogs2_correction_importcrm-atp
  2. Merge into trunk-import_sugarcrm
Proposed by Atul Patel(OpenERP)
Status: Merged
Merged at revision: 4435
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs2_correction_importcrm-atp
Merge into: lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
Diff against target: 130 lines (+15/-11)
6 files modified
import_sugarcrm/__openerp__.py (+1/-1)
import_sugarcrm/import_sugarcrm.py (+3/-3)
import_sugarcrm/import_sugarcrm_view.xml (+1/-1)
import_sugarcrm/sugar.py (+2/-2)
import_sugarcrm/wizard/sugarcrm_login.py (+5/-3)
import_sugarcrm/wizard/sugarcrm_login_view.xml (+3/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs2_correction_importcrm-atp
Reviewer Review Type Date Requested Status
Bhumika Shrimali Pending
Review via email: mp+53960@code.launchpad.net

Description of the change

Hello,

I had made correction for Backlog2.
----------------------------------

1) Change module name "Import_sugarcrm"
2) Add host choice field for sugarcrm connection Path.

Kindly check it.

Thanks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory 'sugarcrm_syncro' => 'import_sugarcrm'
2=== modified file 'import_sugarcrm/__openerp__.py'
3--- sugarcrm_syncro/__openerp__.py 2011-03-02 13:19:33 +0000
4+++ import_sugarcrm/__openerp__.py 2011-03-18 09:07:46 +0000
5@@ -23,7 +23,7 @@
6 'name': 'Import SugarCRM Data into OpenERP Module.',
7 'version': '1.0',
8 'category': 'Generic Modules',
9- 'description': """This Module Import SugarCRM "Leads", "Opportunity", "Accounts" and "contacts" Data into OpenERP Module.""",
10+ 'description': """This Module Import SugarCRM "Leads", "Opportunities", and "Users" Data into OpenERP Module.""",
11 'author': 'OpenERP SA',
12 'website': 'http://www.openerp.com',
13 'depends': ['crm'],
14
15=== modified file 'import_sugarcrm/import_sugarcrm.py'
16--- sugarcrm_syncro/import_sugarcrm.py 2011-03-16 08:36:42 +0000
17+++ import_sugarcrm/import_sugarcrm.py 2011-03-18 09:07:46 +0000
18@@ -52,7 +52,7 @@
19 '.id' : '.id',
20 }
21 user_obj = sugar_obj.pool.get('res.users')
22- PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
23+ PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''), context.get('url',''))
24 sugar_data = sugar.search(PortType,sessionid, 'Users')
25 for val in sugar_data:
26 user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))])
27@@ -130,7 +130,7 @@
28 }
29
30 lead_obj = sugar_obj.pool.get('crm.lead')
31- PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''))
32+ PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''), context.get('url',''))
33 sugar_data = sugar.search(PortType, sessionid, 'Leads')
34 for val in sugar_data:
35 val['type'] = 'lead'
36@@ -152,7 +152,7 @@
37 'type' : 'type',
38 }
39 lead_obj = sugar_obj.pool.get('crm.lead')
40- PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''))
41+ PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''), context.get('url',''))
42 sugar_data = sugar.search(PortType, sessionid, 'Opportunities')
43 for val in sugar_data:
44 val['type'] = 'opportunity'
45
46=== modified file 'import_sugarcrm/import_sugarcrm_view.xml'
47--- sugarcrm_syncro/import_sugarcrm_view.xml 2011-03-10 15:55:04 +0000
48+++ import_sugarcrm/import_sugarcrm_view.xml 2011-03-18 09:07:46 +0000
49@@ -9,7 +9,7 @@
50 <field name="type">form</field>
51 <field name="arch" type="xml">
52 <form string="Import Sugarcrm">
53- <group colspan="4" >
54+ <group colspan="4" width="400" col="3">
55 <separator string="Select SugarCRM Module Name" colspan="4"/>
56 <field name="lead" />
57 <field name="opportunity" />
58
59=== modified file 'import_sugarcrm/sugar.py'
60--- sugarcrm_syncro/sugar.py 2011-03-14 05:50:40 +0000
61+++ import_sugarcrm/sugar.py 2011-03-18 09:07:46 +0000
62@@ -29,10 +29,10 @@
63
64 class LoginError(Exception): pass
65
66-def login(username, password):
67+def login(username, password, url):
68 loc = sugarsoapLocator()
69
70- portType = loc.getsugarsoapPortType()
71+ portType = loc.getsugarsoapPortType(url)
72 request = loginRequest()
73 uauth = ns0.user_auth_Def(request)
74 request._user_auth = uauth
75
76=== modified file 'import_sugarcrm/wizard/sugarcrm_login.py'
77--- sugarcrm_syncro/wizard/sugarcrm_login.py 2011-03-10 15:55:04 +0000
78+++ import_sugarcrm/wizard/sugarcrm_login.py 2011-03-18 09:07:46 +0000
79@@ -20,7 +20,7 @@
80 ##############################################################################
81 from osv import fields, osv
82 from tools.translate import _
83-from sugarcrm_syncro import sugar
84+from import_sugarcrm import sugar
85
86 class sugarcrm_login(osv.osv):
87 """SugarCRM Login"""
88@@ -30,23 +30,25 @@
89 _columns = {
90 'username': fields.char('User Name', size=64, required=True),
91 'password': fields.char('Password', size=24,required=True),
92+ 'url' : fields.char('SugarCRM Path', size=264, required=True, help="Path for SugarCRM connection should be 'http://localhost/sugarcrm/soap.php' Format."),
93 }
94 _defaults = {
95 'username' : 'admin',
96 'password' : 'admin',
97+ 'url': "http://localhost/sugarcrm/soap.php"
98 }
99
100 def open_import(self, cr, uid, ids, context=None):
101
102 for current in self.browse(cr, uid, ids, context):
103- PortType,sessionid = sugar.login(current.username, current.password)
104+ PortType,sessionid = sugar.login(current.username, current.password, current.url)
105 if sessionid == '-1':
106 raise osv.except_osv(_('Error !'), _('Authentication error !\nBad Username or Password !'))
107
108 obj_model = self.pool.get('ir.model.data')
109 model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.sugarcrm.form')])
110 resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
111- context.update({'rec_id': ids, 'username': current.username, 'password': current.password})
112+ context.update({'rec_id': ids, 'username': current.username, 'password': current.password, 'url': current.url})
113 return {
114 'view_type': 'form',
115 'view_mode': 'form',
116
117=== modified file 'import_sugarcrm/wizard/sugarcrm_login_view.xml'
118--- sugarcrm_syncro/wizard/sugarcrm_login_view.xml 2011-03-03 10:58:21 +0000
119+++ import_sugarcrm/wizard/sugarcrm_login_view.xml 2011-03-18 09:07:46 +0000
120@@ -9,7 +9,9 @@
121 <field name="type">form</field>
122 <field name="arch" type="xml">
123 <form string="Sugarcrm Login">
124- <group colspan="4" >
125+ <group colspan="4" width="500" >
126+ <separator string="Please Enter Path to Connect with SugarCRM" colspan="4"/>
127+ <field name="url" colspan="4" widget="url"/>
128 <separator string="Please enter your user name and password." colspan="4"/>
129 <field name="username"/>
130 <newline/>

Subscribers

People subscribed via source and target branches

to all changes: