From 45c7fab903bb7b42f261a26403420ef365d53ff5 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 Mar 2011 19:38:32 +0530
Subject: [PATCH 01/11] [ADD]: ADD Dependency table and import dependency
 before Import table for sugarcrm.

bzr revid: atp@tinyerp.com-20110309140832-kadne2p106oiox8f
---
 addons/sugarcrm_syncro/__init__.py            |   1 +
 addons/sugarcrm_syncro/import_sugarcrm.py     | 273 +++++-------------
 .../sugarcrm_syncro/import_sugarcrm_view.xml  |   2 +-
 .../sugarcrm_fields_mapping.py                |  32 ++
 4 files changed, 112 insertions(+), 196 deletions(-)
 create mode 100644 addons/sugarcrm_syncro/sugarcrm_fields_mapping.py

diff --git a/addons/sugarcrm_syncro/__init__.py b/addons/sugarcrm_syncro/__init__.py
index 94721485e61..c683d3f86c7 100644
--- a/addons/sugarcrm_syncro/__init__.py
+++ b/addons/sugarcrm_syncro/__init__.py
@@ -22,3 +22,4 @@
 import import_sugarcrm
 import sugar
 import wizard
+import sugarcrm_fields_mapping
diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 5eca4174d20..68583e8b5f3 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -22,6 +22,70 @@ from operator import itemgetter
 from osv import fields, osv
 import sugar
 from tools.translate import _
+import sugarcrm_fields_mapping
+
+def import_users(self, cr, uid, context=None):
+    if not context:
+        context = {}
+    map_user = {'Users': 
+           {'name': ['first_name', 'last_name'], 
+           'login': 'user_name',
+           'new_password' : 'pwd_last_changed',
+           } ,
+       }
+    user_obj = self.pool.get('res.users')
+    ids = self.search(cr, uid, [])
+    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
+    sugar_data = sugar.search(PortType,sessionid, 'Users')
+    for val in sugar_data:
+        user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))])
+        if user_ids:
+            return user_ids[0]
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Users', map_user)
+        openerp_val = dict(zip(fields,datas))
+        openerp_val['context_lang'] = context.get('lang','en_US')
+        new_user_id = user_obj.create(cr, uid, openerp_val, context)
+    return new_user_id    
+        
+def import_opportunities(self, cr, uid, context=None):
+   if not context:
+       context = {} 
+   user_id =  import_users(self, cr, uid, context) 
+   map_opportunity = {'Opportunities':  {'name': 'name',
+          'probability': 'probability',
+          'planned_revenue': 'amount_usdollar',
+          'date_deadline':'date_closed'
+          },
+      }
+   ids = self.search(cr, uid, [])
+   lead_pool = self.pool.get('crm.lead')
+   PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
+   sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
+   for val in sugar_data:
+       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
+       openerp_val = dict(zip(fields,datas))
+       openerp_val['type'] = 'opportunity'
+       openerp_val['user_id'] = user_id
+       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
+   return new_lead_id           
+        
+def resolve_dependencies(self, cr, uid, dict, dep, key, context=None):
+     if not context:
+         context = {}
+     for dependency in dep:
+       resolve_dependencies(self, cr, uid, dict, dict[dependency]['dependencies'], key, context)
+       dict[dependency]['process'](self, cr, uid, context)
+     dict[key]['process'](self, cr, uid, context)
+     return True 
+
+MAP_FIELDS = {'Opportunities':  #Object Mapping name
+                     { 'dependencies' : ['Users'],  #Object to import before this table
+                       'process' : import_opportunities,
+                     },
+                'Users' : {'dependencies' : [],
+                          'process' : import_users,
+                         }
+          } 
 
 class import_sugarcrm(osv.osv):
      """Import SugarCRM DATA"""
@@ -39,202 +103,21 @@ class import_sugarcrm(osv.osv):
         'opportunity': lambda *a: True,
      }        
 
-     def _get_all(self, cr, uid, model, sugar_val, context=None):
+     def import_all(self, cr, uid, ids, context=None):
            if not context:
                context = {}
-           models = self.pool.get(model)
-           all_model_ids = models.search(cr, uid, [('name', '=', sugar_val)])
-           output = [(False, '')]
-           output = sorted([(o.id, o.name)
-                    for o in models.browse(cr, uid, all_model_ids,
-                                           context=context)],
-                   key=itemgetter(1))
-           return output
-
-     def _get_all_states(self, cr, uid, sugar_val, context=None):
-        if not context:
-            context = {}         
-        return self._get_all(
-            cr, uid, 'res.country.state', sugar_val, context=context)
-
-     def _get_all_countries(self, cr, uid, sugar_val, context=None):
-        if not context:
-            context = {}         
-        return self._get_all(
-            cr, uid, 'res.country', sugar_val, context=context)
-
-     def _get_lead_status(self, cr, uid, sugar_val, context=None):
-        if not context:
-            context = {}         
-        sugar_stage = ''
-        if sugar_val.get('status','') == 'New':
-            sugar_stage = 'New'
-        elif sugar_val.get('status','') == 'Assigned':
-            sugar_stage = 'Qualification'
-        elif sugar_val.get('status','') == 'In Progress':
-            sugar_stage = 'Proposition'
-        elif sugar_val.get('status','') == 'Recycled':
-            sugar_stage = 'Negotiation'
-        elif sugar_val.get('status','') == 'Dead':
-            sugar_stage = 'Lost'
-        else:
-            sugar_stage = ''
-        return sugar_stage
-
-     def _get_opportunity_status(self, cr, uid, sugar_val, context=None):
-        if not context:
-            context = {}         
-        sugar_stage = ''
-        if sugar_val.get('sales_stage','') == 'Need Analysis':
-             sugar_stage = 'New'
-        elif sugar_val.get('sales_stage','') == 'Closed Lost':
-             sugar_stage = 'Lost'
-        elif sugar_val.get('sales_stage','') == 'Closed Won':
-             sugar_stage = 'Won'
-        elif sugar_val.get('sales_stage','') == 'Value Proposition':
-             sugar_stage = 'Proposition'
-        elif sugar_val.get('sales_stage','') == 'Negotiation/Review':
-             sugar_stage = 'Negotiation'
-        else:
-             sugar_stage = ''
-        return sugar_stage    
-    
-     def create_lead(self, cr, uid, sugar_val, country, state, context=None):
-           if not context:
-                context = {}         
-         
-           lead_pool = self.pool.get("crm.lead")
-           stage_id = ''
-           stage = self._get_lead_status(cr, uid, sugar_val, context=None)
-           stage_pool = self.pool.get('crm.case.stage')
-
-           stage_ids = stage_pool.search(cr, uid, [("type", '=', 'lead'), ('name', '=', stage)])
-
-           for stage in stage_pool.browse(cr, uid, stage_ids):
-               stage_id = stage.id     
-           vals = {'name': sugar_val.get('first_name','')+' '+ sugar_val.get('last_name',''),
-                   'contact_name': sugar_val.get('first_name','')+' '+ sugar_val.get('last_name',''),
-                   'user_id':sugar_val.get('created_by',''),
-                   'description': sugar_val.get('description',''),
-                   'partner_name': sugar_val.get('first_name','')+' '+ sugar_val.get('last_name',''),
-                   'email_from': sugar_val.get('email1',''),
-                   'stage_id': stage_id or '',
-                   'phone': sugar_val.get('phone_work',''),
-                   'mobile': sugar_val.get('phone_mobile',''),
-                   'write_date':sugar_val.get('date_modified',''),
-                   'function':sugar_val.get('title',''),
-                   'street': sugar_val.get('primary_address_street',''),
-                   'zip': sugar_val.get('primary_address_postalcode',''),
-                   'city':sugar_val.get('primary_address_city',''),
-                   'country_id': country and country[0][0] or False,
-                   'state_id': state and state[0][0] or False
-           }
-           new_lead_id = lead_pool.create(cr, uid, vals)
-           return new_lead_id
-
-     def create_opportunity(self, cr, uid, sugar_val, country, state, context=None):
-           if not context:
-                context = {}         
-           lead_pool = self.pool.get("crm.lead")
-           stage_id = ''
-           stage_pool = self.pool.get('crm.case.stage')
-           stage = self._get_opportunity_status(cr, uid, sugar_val, context)
-           
-           stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])           
-           for stage in stage_pool.browse(cr, uid, stage_ids):
-               stage_id = stage.id
-           vals = {'name': sugar_val.get('name',''),
-               'probability': sugar_val.get('probability',''),
-               'user_id': sugar_val.get('created_by', ''),
-               'stage_id': stage_id or '',
-               'type': 'opportunity',
-               'user_id': sugar_val.get('created_by',''),
-               'planned_revenue': sugar_val.get('amount_usdollar'),
-               'write_date':sugar_val.get('date_modified',''),
-           }
-           new_opportunity_id = lead_pool.create(cr, uid, vals)
-           return new_opportunity_id
-
-     def _get_sugar_module_name(self, cr, uid, ids, context=None):
-         
-        if not context:
-             context = {}         
-
-        sugar_name = []
-
-        for current in self.read(cr, uid, ids):
-          if current.get('lead'):   
-              sugar_name.append('Leads')
-          if  current.get('opportunity'):
-              sugar_name.append('Opportunities')
-                
-        return sugar_name    
-    
-
-     def _get_module_name(self, cr, uid, ids, context=None):
-        
-       if not context:
-            context = {}         
-       module_name = []
-
-       for current in self.read(cr, uid, ids, ['lead', 'opportunity']):
-          if not current.get('lead') and not current.get('opportunity'):
-              raise osv.except_osv(_('Error !'), _('Please Select Module')) 
-               
-          if current.get('lead'):   
-              module_name.append('crm')
-          if current.get('opportunity'):    
-              module_name.append('crm')
-
-          ids = self.pool.get("ir.module.module").search(cr, uid, [('name', 'in', module_name),('state', '=', 'installed')])
-          if not ids:
-              for module in module_name:
-                  raise osv.except_osv(_('Error !'), _('Please  Install %s Module') % ((module)))
-
-     def get_create_method(self, cr, uid, sugar_name, sugar_val, country, state, context=None):
-        if not context:
-            context = {}         
-
-        if sugar_name == "Leads":
-            self.create_lead(cr, uid, sugar_val, country, state, context)
-        
-        elif sugar_name == "Opportunities":
-            self.create_opportunity(cr, uid, sugar_val, country, state,context)
-        return {}    
-    
-     def import_data(self, cr, uid, ids,context=None):
-       if not context:
-        context={}
-       sugar_val = []
-              
-       self._get_module_name(cr, uid, ids, context)
-       sugar_module = self._get_sugar_module_name(cr, uid, ids, context=None)
-                 
-       PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
-       for sugar_name in sugar_module:
-           sugar_data = sugar.search(PortType,sessionid,sugar_name)
-           
-           for val in sugar_data: 
-                country = self._get_all_countries(cr, uid, val.get('primary_address_country'), context)
-                state = self._get_all_states(cr, uid, val.get('primary_address_state'), context)
-                self.get_create_method(cr, uid, sugar_name, val, country, state, context)
-
-                    
-       obj_model = self.pool.get('ir.model.data')
-       model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
-       resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-       return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'import.message',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }                 
+           for key in MAP_FIELDS.keys():
+                resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], key, context=context)
+           obj_model = self.pool.get('ir.model.data')
+           model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
+           resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+           return {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'import.message',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }                 
 
 import_sugarcrm()
-
-
-
-
-
diff --git a/addons/sugarcrm_syncro/import_sugarcrm_view.xml b/addons/sugarcrm_syncro/import_sugarcrm_view.xml
index 96c2043a9cf..a847c0ebe77 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm_view.xml
+++ b/addons/sugarcrm_syncro/import_sugarcrm_view.xml
@@ -20,7 +20,7 @@
                     <group colspan="4" >
                         <label string="" colspan="2"/>
                         <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button name="import_data" string="Import"
+                        <button name="import_all" string="Import"
                                 type="object" icon="gtk-ok"/>
                    </group>
                 </form>
diff --git a/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py b/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py
new file mode 100644
index 00000000000..ecc4534ba4a
--- /dev/null
+++ b/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+def sugarcrm_fields_mapp(dict_sugar,openerp_obj,openerp_dict):
+    fields=[]
+    data_lst = []
+    for key,val in openerp_dict.get(openerp_obj).items():
+        if key not in fields:
+            fields.append(key)
+            if isinstance(val, list):
+                data_lst.append(dict_sugar.get(val[0],['']) + ' ' + dict_sugar.get(val[1],['']))
+            else:
+                data_lst.append(dict_sugar.get(val,['']))
+    return fields,data_lst

From 600ffac3d56bfcf46ec59309bbfed1a88df55c97 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 Mar 2011 10:49:58 +0530
Subject: [PATCH 02/11] [IMP]: Import data for opportunity and correct some
 problem for dependency.

bzr revid: atp@tinyerp.com-20110310051958-u30t8o233aq3euet
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 68583e8b5f3..7531fb17711 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -50,7 +50,7 @@ def import_users(self, cr, uid, context=None):
 def import_opportunities(self, cr, uid, context=None):
    if not context:
        context = {} 
-   user_id =  import_users(self, cr, uid, context) 
+   user_id = import_users(self, cr, uid, context) 
    map_opportunity = {'Opportunities':  {'name': 'name',
           'probability': 'probability',
           'planned_revenue': 'amount_usdollar',
@@ -69,13 +69,12 @@ def import_opportunities(self, cr, uid, context=None):
        new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
    return new_lead_id           
         
-def resolve_dependencies(self, cr, uid, dict, dep, key, context=None):
+def resolve_dependencies(self, cr, uid, dict, dep, context=None):
      if not context:
          context = {}
      for dependency in dep:
-       resolve_dependencies(self, cr, uid, dict, dict[dependency]['dependencies'], key, context)
+       resolve_dependencies(self, cr, uid, dict, dict[dependency]['dependencies'], context)
        dict[dependency]['process'](self, cr, uid, context)
-     dict[key]['process'](self, cr, uid, context)
      return True 
 
 MAP_FIELDS = {'Opportunities':  #Object Mapping name
@@ -107,7 +106,9 @@ class import_sugarcrm(osv.osv):
            if not context:
                context = {}
            for key in MAP_FIELDS.keys():
-                resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], key, context=context)
+                resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], context=context)
+                if MAP_FIELDS[key]['dependencies']:
+                    MAP_FIELDS[key]['process'](self, cr, uid, context)
            obj_model = self.pool.get('ir.model.data')
            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])

From 90952d584658d16d4b2cdac5768603a5a3b24a92 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 Mar 2011 12:21:22 +0530
Subject: [PATCH 03/11] [ADD]: Import sugarcrm leads data into crm lead and
 import stage for lead and opportunity.

bzr revid: atp@tinyerp.com-20110310065122-l3ks5n5u2st8nwc7
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 113 ++++++++++++++++++++--
 1 file changed, 103 insertions(+), 10 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 7531fb17711..77d7085ac08 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -18,10 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from operator import itemgetter
 from osv import fields, osv
 import sugar
-from tools.translate import _
 import sugarcrm_fields_mapping
 
 def import_users(self, cr, uid, context=None):
@@ -46,6 +44,80 @@ def import_users(self, cr, uid, context=None):
         openerp_val['context_lang'] = context.get('lang','en_US')
         new_user_id = user_obj.create(cr, uid, openerp_val, context)
     return new_user_id    
+  
+def get_lead_status(self, cr, uid, sugar_val,context=None):
+    if not context:
+       context = {}  
+    stage_id = ''          
+    stage_dict = {'status': #field in the sugarcrm database
+             { #Mapping of sugarcrm stage : openerp opportunity stage 
+                'New' : 'New',
+                'Assigned':'Qualification',
+               'In Progress': 'Proposition',
+               'Recycled': 'Negotiation',
+               'Dead': 'Lost'
+            },}  
+    stage = stage_dict['status'].get(sugar_val['status'], '')
+    lead_pool = self.pool.get("crm.lead")
+    stage_pool = self.pool.get('crm.case.stage')
+    stage_ids = stage_pool.search(cr, uid, [("type", '=', 'lead'), ('name', '=', stage)])
+    for stage in stage_pool.browse(cr, uid, stage_ids, context):
+        stage_id = stage.id         
+    return stage_id
+
+def get_opportunity_status(self, cr, uid, sugar_val,context=None):
+    if not context:
+       context = {} 
+    stage_id = ''           
+    stage_dict = {'sales_stage': #field in the sugarcrm database
+             { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
+                'Need Analysis': 'New',
+                'Closed Lost': 'Lost',
+               'Closed Won': 'Won',
+               'Value Proposition': 'Proposition',
+               'Negotiation/Review': 'Negotiation'
+            },}  
+    stage = stage_dict['sales_stage'].get(sugar_val['sales_stage'], '')
+    lead_pool = self.pool.get("crm.lead")
+    stage_pool = self.pool.get('crm.case.stage')
+    stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])
+    for stage in stage_pool.browse(cr, uid, stage_ids, context):
+        stage_id = stage.id         
+    return stage_id
+  
+def import_leads(self, cr, uid, context=None):
+   if not context:
+       context = {} 
+   user_id = import_users(self, cr, uid, context) 
+   map_lead = {               
+            'Leads':{'name': ['first_name','last_name'],
+                   'contact_name': ['first_name','last_name'],
+                   'description': 'description',
+                   'partner_name': ['first_name','last_name'],
+                   'email_from': 'email1',
+                   'phone': 'phone_work',
+                   'mobile': 'phone_mobile',
+                   'write_date':'date_modified',
+                   'function':'title',
+                   'street': 'primary_address_street',
+                   'zip': 'primary_address_postalcode',
+                   'city':'primary_address_city',
+                  },
+               }
+      
+   ids = self.search(cr, uid, [])
+   lead_pool = self.pool.get('crm.lead')
+   PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
+   sugar_data = sugar.search(PortType,sessionid, 'Leads')
+   for val in sugar_data:
+       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
+       stage_id = get_lead_status(self, cr, uid, val, context)
+       openerp_val = dict(zip(fields,datas))
+       openerp_val['type'] = 'lead'
+       openerp_val['user_id'] = user_id
+       openerp_val['stage_id'] = stage_id
+       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
+   return new_lead_id    
         
 def import_opportunities(self, cr, uid, context=None):
    if not context:
@@ -63,11 +135,13 @@ def import_opportunities(self, cr, uid, context=None):
    sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
    for val in sugar_data:
        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
+       stage_id = get_opportunity_status(self, cr, uid, val, context)
        openerp_val = dict(zip(fields,datas))
        openerp_val['type'] = 'opportunity'
        openerp_val['user_id'] = user_id
-       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
-   return new_lead_id           
+       openerp_val['stage_id'] = stage_id
+       new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
+   return new_opportunity_id           
         
 def resolve_dependencies(self, cr, uid, dict, dep, context=None):
      if not context:
@@ -83,7 +157,11 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
                      },
                 'Users' : {'dependencies' : [],
                           'process' : import_users,
-                         }
+                         },
+              'Leads':
+              { 'dependencies' : ['Users'],  #Object to import before this table
+                       'process' : import_leads,
+                     },  
           } 
 
 class import_sugarcrm(osv.osv):
@@ -101,14 +179,29 @@ class import_sugarcrm(osv.osv):
         'lead': lambda *a: True,
         'opportunity': lambda *a: True,
      }        
-
+     def get_key(self, cr, uid, ids, context=None):
+         """Select Key as For which Module data we want import data."""
+         if not context:
+             context = {}
+         key_list = []
+         for current in self.browse(cr, uid, ids, context):
+             if current.lead:
+                   key_list.append('Leads')
+             if current.opportunity:
+                   key_list.append('Opportunities')
+                
+         return key_list     
+              
      def import_all(self, cr, uid, ids, context=None):
+           """Import all sugarcrm data into openerp module"""
            if not context:
                context = {}
-           for key in MAP_FIELDS.keys():
-                resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], context=context)
-                if MAP_FIELDS[key]['dependencies']:
-                    MAP_FIELDS[key]['process'](self, cr, uid, context)
+           keys = self.get_key(cr, uid, ids, context)
+           for key in keys:
+               resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], context=context)
+               if MAP_FIELDS[key]['dependencies']:
+                       MAP_FIELDS[key]['process'](self, cr, uid, context)
+                                                                 
            obj_model = self.pool.get('ir.model.data')
            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])

From 9aec0c4416f67ba3df3077778ba281d6ddc021c9 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 Mar 2011 15:25:37 +0530
Subject: [PATCH 04/11] [FIX]: correct buildbots warning for sugarcrm.

bzr revid: atp@tinyerp.com-20110310095537-t19fd2qzszxfxirv
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 77d7085ac08..d9178fc8a71 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -32,7 +32,6 @@ def import_users(self, cr, uid, context=None):
            } ,
        }
     user_obj = self.pool.get('res.users')
-    ids = self.search(cr, uid, [])
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Users')
     for val in sugar_data:
@@ -58,7 +57,6 @@ def get_lead_status(self, cr, uid, sugar_val,context=None):
                'Dead': 'Lost'
             },}  
     stage = stage_dict['status'].get(sugar_val['status'], '')
-    lead_pool = self.pool.get("crm.lead")
     stage_pool = self.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [("type", '=', 'lead'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
@@ -78,7 +76,6 @@ def get_opportunity_status(self, cr, uid, sugar_val,context=None):
                'Negotiation/Review': 'Negotiation'
             },}  
     stage = stage_dict['sales_stage'].get(sugar_val['sales_stage'], '')
-    lead_pool = self.pool.get("crm.lead")
     stage_pool = self.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
@@ -105,7 +102,6 @@ def import_leads(self, cr, uid, context=None):
                   },
                }
       
-   ids = self.search(cr, uid, [])
    lead_pool = self.pool.get('crm.lead')
    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
    sugar_data = sugar.search(PortType,sessionid, 'Leads')
@@ -129,7 +125,6 @@ def import_opportunities(self, cr, uid, context=None):
           'date_deadline':'date_closed'
           },
       }
-   ids = self.search(cr, uid, [])
    lead_pool = self.pool.get('crm.lead')
    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
    sugar_data = sugar.search(PortType,sessionid, 'Opportunities')

From 98f48edd429b3a1e3c9bfd6f5a481fb8998997d4 Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 10 Mar 2011 16:55:04 +0100
Subject: [PATCH 05/11] [IMP]

bzr revid: tfr@openerp.com-20110310155504-so6i5w9m9fzlevwe
---
 addons/sugarcrm_syncro/import_sugarcrm.py     | 317 ++++++++++--------
 .../sugarcrm_syncro/import_sugarcrm_view.xml  |   1 +
 addons/sugarcrm_syncro/sugar.py               |   2 +
 .../sugarcrm_syncro/wizard/sugarcrm_login.py  |  26 +-
 4 files changed, 197 insertions(+), 149 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index d9178fc8a71..43fb9e75009 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -21,130 +21,148 @@
 from osv import fields, osv
 import sugar
 import sugarcrm_fields_mapping
+import pprint
+pp = pprint.PrettyPrinter(indent=4)
 
-def import_users(self, cr, uid, context=None):
+def create_mapping(obj, cr, uid, res_model, open_id, sugar_id, context):
+    model_data = {
+        'name':  sugar_id,
+        'model': res_model,
+        'module': 'sugarcrm_import',
+        'res_id': open_id
+    }
+    model_obj = obj.pool.get('ir.model.data')
+    model_obj.create(cr, uid, model_data, context=context)
+
+def find_mapped_id(obj, cr, uid, res_model, sugar_id, context):
+    model_obj = obj.pool.get('ir.model.data')
+    return model_obj.search(cr, uid, [('model', '=', res_model), ('module', '=', 'sugarcrm_import'), ('name', '=', sugar_id)], context=context)
+
+
+def import_users(surgar_obj, cr, uid, context=None):
     if not context:
         context = {}
-    map_user = {'Users': 
-           {'name': ['first_name', 'last_name'], 
-           'login': 'user_name',
-           'new_password' : 'pwd_last_changed',
-           } ,
-       }
-    user_obj = self.pool.get('res.users')
+    map_user = {'Users':
+            {'name': ['first_name', 'last_name'],
+            'login': 'user_name',
+            'new_password' : 'pwd_last_changed',
+            } ,
+        }
+    user_obj = surgar_obj.pool.get('res.users')
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Users')
+    #pp.pprint(sugar_data)
     for val in sugar_data:
+        #pp.pprint(val)
         user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))])
-        if user_ids:
-            return user_ids[0]
+        print 'ids', user_ids
+        if user_ids: #we skip the import of admin but we should save the mapping in ir.model.data
+            #create_mapping(sugar_obj, cr, uid,
+            continue
         fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Users', map_user)
         openerp_val = dict(zip(fields,datas))
+        #print 'openerpval'
+        #pp.pprint(openerp_val)
         openerp_val['context_lang'] = context.get('lang','en_US')
         new_user_id = user_obj.create(cr, uid, openerp_val, context)
-    return new_user_id    
-  
-def get_lead_status(self, cr, uid, sugar_val,context=None):
+    return new_user_id
+
+def get_lead_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
-       context = {}  
-    stage_id = ''          
+        context = {}
+    stage_id = ''
     stage_dict = {'status': #field in the sugarcrm database
-             { #Mapping of sugarcrm stage : openerp opportunity stage 
-                'New' : 'New',
-                'Assigned':'Qualification',
-               'In Progress': 'Proposition',
-               'Recycled': 'Negotiation',
-               'Dead': 'Lost'
-            },}  
+        { #Mapping of sugarcrm stage : openerp opportunity stage
+            'New' : 'New',
+            'Assigned':'Qualification',
+            'In Progress': 'Proposition',
+            'Recycled': 'Negotiation',
+            'Dead': 'Lost'
+        },}
     stage = stage_dict['status'].get(sugar_val['status'], '')
-    stage_pool = self.pool.get('crm.case.stage')
+    stage_pool = surgar_obj.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [("type", '=', 'lead'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
-        stage_id = stage.id         
+        stage_id = stage.id
     return stage_id
 
-def get_opportunity_status(self, cr, uid, sugar_val,context=None):
+def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
-       context = {} 
-    stage_id = ''           
+        context = {}
+    stage_id = ''
     stage_dict = {'sales_stage': #field in the sugarcrm database
-             { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
-                'Need Analysis': 'New',
-                'Closed Lost': 'Lost',
+            { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
+               'Need Analysis': 'New',
+               'Closed Lost': 'Lost',
                'Closed Won': 'Won',
                'Value Proposition': 'Proposition',
-               'Negotiation/Review': 'Negotiation'
-            },}  
+                'Negotiation/Review': 'Negotiation'
+            },}
     stage = stage_dict['sales_stage'].get(sugar_val['sales_stage'], '')
-    stage_pool = self.pool.get('crm.case.stage')
+    stage_pool = surgar_obj.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
-        stage_id = stage.id         
+        stage_id = stage.id
     return stage_id
-  
-def import_leads(self, cr, uid, context=None):
-   if not context:
-       context = {} 
-   user_id = import_users(self, cr, uid, context) 
-   map_lead = {               
+
+def import_leads(surgar_obj, cr, uid, context=None):
+    if not context:
+        context = {}
+    user_id = import_users(surgar_obj, cr, uid, context)
+    map_lead = {
             'Leads':{'name': ['first_name','last_name'],
-                   'contact_name': ['first_name','last_name'],
-                   'description': 'description',
-                   'partner_name': ['first_name','last_name'],
-                   'email_from': 'email1',
-                   'phone': 'phone_work',
-                   'mobile': 'phone_mobile',
-                   'write_date':'date_modified',
-                   'function':'title',
-                   'street': 'primary_address_street',
-                   'zip': 'primary_address_postalcode',
-                   'city':'primary_address_city',
-                  },
-               }
-      
-   lead_pool = self.pool.get('crm.lead')
-   PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
-   sugar_data = sugar.search(PortType,sessionid, 'Leads')
-   for val in sugar_data:
-       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
-       stage_id = get_lead_status(self, cr, uid, val, context)
-       openerp_val = dict(zip(fields,datas))
-       openerp_val['type'] = 'lead'
-       openerp_val['user_id'] = user_id
-       openerp_val['stage_id'] = stage_id
-       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
-   return new_lead_id    
-        
-def import_opportunities(self, cr, uid, context=None):
-   if not context:
-       context = {} 
-   user_id = import_users(self, cr, uid, context) 
-   map_opportunity = {'Opportunities':  {'name': 'name',
-          'probability': 'probability',
-          'planned_revenue': 'amount_usdollar',
-          'date_deadline':'date_closed'
-          },
-      }
-   lead_pool = self.pool.get('crm.lead')
-   PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
-   sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
-   for val in sugar_data:
-       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
-       stage_id = get_opportunity_status(self, cr, uid, val, context)
-       openerp_val = dict(zip(fields,datas))
-       openerp_val['type'] = 'opportunity'
-       openerp_val['user_id'] = user_id
-       openerp_val['stage_id'] = stage_id
-       new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
-   return new_opportunity_id           
-        
-def resolve_dependencies(self, cr, uid, dict, dep, context=None):
-     if not context:
-         context = {}
-     for dependency in dep:
-       resolve_dependencies(self, cr, uid, dict, dict[dependency]['dependencies'], context)
-       dict[dependency]['process'](self, cr, uid, context)
-     return True 
+            'contact_name': ['first_name','last_name'],
+            'description': 'description',
+            'partner_name': ['first_name','last_name'],
+            'email_from': 'email1',
+            'phone': 'phone_work',
+            'mobile': 'phone_mobile',
+            'write_date':'date_modified',
+            'function':'title',
+            'street': 'primary_address_street',
+            'zip': 'primary_address_postalcode',
+            'city':'primary_address_city',
+            },
+        }
+
+    lead_pool = surgar_obj.pool.get('crm.lead')
+    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
+    sugar_data = sugar.search(PortType,sessionid, 'Leads')
+    for val in sugar_data:
+        pp.pprint(val)
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
+        stage_id = get_lead_status(surgar_obj, cr, uid, val, context)
+        openerp_val = dict(zip(fields,datas))
+        openerp_val['type'] = 'lead'
+        openerp_val['user_id'] = user_id
+        openerp_val['stage_id'] = stage_id
+        new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
+    return new_lead_id
+
+def import_opportunities(surgar_obj, cr, uid, context=None):
+    if not context:
+        context = {}
+    user_id = import_users(surgar_obj, cr, uid, context)
+    map_opportunity = {'Opportunities':  {'name': 'name',
+        'probability': 'probability',
+        'planned_revenue': 'amount_usdollar',
+        'date_deadline':'date_closed'
+        },
+    }
+    lead_pool = surgar_obj.pool.get('crm.lead')
+    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
+    sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
+    for val in sugar_data:
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
+        stage_id = get_opportunity_status(surgar_obj, cr, uid, val, context)
+        openerp_val = dict(zip(fields,datas))
+        openerp_val['type'] = 'opportunity'
+        openerp_val['user_id'] = user_id
+        openerp_val['stage_id'] = stage_id
+        new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
+    return new_opportunity_id
+
+
 
 MAP_FIELDS = {'Opportunities':  #Object Mapping name
                      { 'dependencies' : ['Users'],  #Object to import before this table
@@ -156,57 +174,80 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
               'Leads':
               { 'dependencies' : ['Users'],  #Object to import before this table
                        'process' : import_leads,
-                     },  
-          } 
+                     },
+          }
+
+
+
 
 class import_sugarcrm(osv.osv):
-     """Import SugarCRM DATA"""
+    """Import SugarCRM DATA"""
 
-     _name = "import.sugarcrm"
-     _description = __doc__
-     _columns = {
+
+    _name = "import.sugarcrm"
+    _description = __doc__
+    _columns = {
         'lead': fields.boolean('Leads', help="If Leads is checked, SugarCRM Leads data imported in openerp crm-Lead form"),
         'opportunity': fields.boolean('Opportunities', help="If Leads is checked, SugarCRM Leads data imported in openerp crm-Opportunity form"),
-         'username': fields.char('User Name', size=64),
-         'password': fields.char('Password', size=24),
-     }
-     _defaults = {
-        'lead': lambda *a: True,
-        'opportunity': lambda *a: True,
-     }        
-     def get_key(self, cr, uid, ids, context=None):
-         """Select Key as For which Module data we want import data."""
-         if not context:
-             context = {}
-         key_list = []
-         for current in self.browse(cr, uid, ids, context):
-             if current.lead:
-                   key_list.append('Leads')
-             if current.opportunity:
-                   key_list.append('Opportunities')
-                
-         return key_list     
-              
-     def import_all(self, cr, uid, ids, context=None):
-           """Import all sugarcrm data into openerp module"""
-           if not context:
-               context = {}
-           keys = self.get_key(cr, uid, ids, context)
-           for key in keys:
-               resolve_dependencies(self, cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], context=context)
-               if MAP_FIELDS[key]['dependencies']:
-                       MAP_FIELDS[key]['process'](self, cr, uid, context)
-                                                                 
-           obj_model = self.pool.get('ir.model.data')
-           model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
-           resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-           return {
+        'user': fields.boolean('User', help="If Users is checked, SugarCRM Users data imported in openerp crm-Opportunity form"),
+        'username': fields.char('User Name', size=64),
+        'password': fields.char('Password', size=24),
+    }
+    _defaults = {
+       'lead': True,
+       'opportunity': True,
+       'user' : True,
+    }
+    def get_key(self, cr, uid, ids, context=None):
+        """Select Key as For which Module data we want import data."""
+        if not context:
+            context = {}
+        key_list = []
+        for current in self.browse(cr, uid, ids, context):
+            if current.lead:
+                key_list.append('Leads')
+            if current.opportunity:
+                key_list.append('Opportunities')
+            if current.user:
+                key_list.append('Users')
+
+        return key_list
+
+    def import_all(self, cr, uid, ids, context=None):
+        """Import all sugarcrm data into openerp module"""
+        if not context:
+            context = {}
+        keys = self.get_key(cr, uid, ids, context)
+        imported = set() #to invoid importing 2 times the sames modules
+        for key in keys:
+            print imported
+            if not key in imported:
+                self.resolve_dependencies(cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], imported, context=context)
+                MAP_FIELDS[key]['process'](self, cr, uid, context)
+                imported.add(key)
+
+
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+        return {
                 'view_type': 'form',
                 'view_mode': 'form',
                 'res_model': 'import.message',
                 'views': [(resource_id,'form')],
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-            }                 
+            }
+
+    def resolve_dependencies(self, cr, uid, dict, dep, imported, context=None):
+        for dependency in dep:
+            if not dependency in imported:
+                self.resolve_dependencies(cr, uid, dict, dict[dependency]['dependencies'], imported, context=context)
+                dict[dependency]['process'](self, cr, uid, context)
+                imported.add(dependency)
+
+
+
+
 
 import_sugarcrm()
diff --git a/addons/sugarcrm_syncro/import_sugarcrm_view.xml b/addons/sugarcrm_syncro/import_sugarcrm_view.xml
index a847c0ebe77..26a3b259140 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm_view.xml
+++ b/addons/sugarcrm_syncro/import_sugarcrm_view.xml
@@ -13,6 +13,7 @@
                          <separator string="Select SugarCRM Module Name" colspan="4"/>
                          <field name="lead" />
                          <field name="opportunity" />
+                         <field name="user" />
                          <field name="username" invisible="1"/>
                          <field name="password" invisible="1"/>
                     </group>
diff --git a/addons/sugarcrm_syncro/sugar.py b/addons/sugarcrm_syncro/sugar.py
index 6e9835823ee..1ade81cd493 100644
--- a/addons/sugarcrm_syncro/sugar.py
+++ b/addons/sugarcrm_syncro/sugar.py
@@ -57,8 +57,10 @@ def search(portType, sessionid, module_name=None):
   if se_resp:
       list = se_resp._return._entry_list
       for i in list:
+          print "import d'un user"
           ans_dir = {}
           for j in i._name_value_list:
+              print j._name , j._value
               ans_dir[j._name.encode('utf-8')] = j._value.encode('utf-8')
             #end for
           ans_list.append(ans_dir)
diff --git a/addons/sugarcrm_syncro/wizard/sugarcrm_login.py b/addons/sugarcrm_syncro/wizard/sugarcrm_login.py
index b60f9db7f99..0ebb68cb020 100644
--- a/addons/sugarcrm_syncro/wizard/sugarcrm_login.py
+++ b/addons/sugarcrm_syncro/wizard/sugarcrm_login.py
@@ -23,17 +23,21 @@ from tools.translate import _
 from sugarcrm_syncro import sugar
 
 class sugarcrm_login(osv.osv):
-     """SugarCRM Login"""
+    """SugarCRM Login"""
 
-     _name = "sugarcrm.login"
-     _description = __doc__
-     _columns = {
-                'username': fields.char('User Name', size=64, required=True),
-                'password': fields.char('Password', size=24,required=True),
-     }
+    _name = "sugarcrm.login"
+    _description = __doc__
+    _columns = {
+        'username': fields.char('User Name', size=64, required=True),
+        'password': fields.char('Password', size=24,required=True),
+    }
+    _defaults = {
+       'username' : 'admin',
+       'password' : 'admin',
+    }
+
+    def open_import(self, cr, uid, ids, context=None):
 
-     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)
             if sessionid == '-1':
@@ -52,5 +56,5 @@ class sugarcrm_login(osv.osv):
             'target': 'new',
             'context': context
         }
-                    
-sugarcrm_login()     
+
+sugarcrm_login()

From 62e8e0a8b529b1de4cecfd3febf5b3121c49839c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 14 Mar 2011 11:20:40 +0530
Subject: [PATCH 06/11] [FIX]: Remove print statement and Fix Import user
 problem.

bzr revid: atp@tinyerp.com-20110314055040-m7rlh5fv6k6huk3d
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 68 +++++++++++++----------
 addons/sugarcrm_syncro/sugar.py           |  2 -
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 43fb9e75009..aec2ee2ba64 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -48,21 +48,17 @@ def import_users(surgar_obj, cr, uid, context=None):
             'new_password' : 'pwd_last_changed',
             } ,
         }
+    new_user_id = False
     user_obj = surgar_obj.pool.get('res.users')
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Users')
-    #pp.pprint(sugar_data)
     for val in sugar_data:
-        #pp.pprint(val)
         user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))])
-        print 'ids', user_ids
         if user_ids: #we skip the import of admin but we should save the mapping in ir.model.data
-            #create_mapping(sugar_obj, cr, uid,
+            #create_mapping(surgar_obj, cr, uid
             continue
         fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Users', map_user)
         openerp_val = dict(zip(fields,datas))
-        #print 'openerpval'
-        #pp.pprint(openerp_val)
         openerp_val['context_lang'] = context.get('lang','en_US')
         new_user_id = user_obj.create(cr, uid, openerp_val, context)
     return new_user_id
@@ -108,7 +104,6 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
 def import_leads(surgar_obj, cr, uid, context=None):
     if not context:
         context = {}
-    user_id = import_users(surgar_obj, cr, uid, context)
     map_lead = {
             'Leads':{'name': ['first_name','last_name'],
             'contact_name': ['first_name','last_name'],
@@ -124,25 +119,34 @@ def import_leads(surgar_obj, cr, uid, context=None):
             'city':'primary_address_city',
             },
         }
-
+    user_id = False
     lead_pool = surgar_obj.pool.get('crm.lead')
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Leads')
+    new_lead_id = False
     for val in sugar_data:
-        pp.pprint(val)
-        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
-        stage_id = get_lead_status(surgar_obj, cr, uid, val, context)
-        openerp_val = dict(zip(fields,datas))
-        openerp_val['type'] = 'lead'
-        openerp_val['user_id'] = user_id
-        openerp_val['stage_id'] = stage_id
-        new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
+       #Need To FIx for Import user data record from sugarcrm.
+       if val.get('assigned_user_name'):
+           user_ids = surgar_obj.pool.get('res.users').search(cr, uid, [('name', '=', val.get("assigned_user_name"))])
+       if not user_ids:
+           user_ids = surgar_obj.pool.get('res.users').create(cr, uid, {'name': val.get('assigned_user_name'), 'login': val.get("assigned_user_name")})
+       if user_ids:
+           if isinstance(user_ids,list):
+               user_id = user_ids[0]
+           else:
+                user_id=user_ids                  
+       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
+       stage_id = get_lead_status(surgar_obj, cr, uid, val, context)
+       openerp_val = dict(zip(fields,datas))
+       openerp_val['type'] = 'lead'
+       openerp_val['user_id'] = user_id
+       openerp_val['stage_id'] = stage_id
+       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
     return new_lead_id
 
 def import_opportunities(surgar_obj, cr, uid, context=None):
     if not context:
         context = {}
-    user_id = import_users(surgar_obj, cr, uid, context)
     map_opportunity = {'Opportunities':  {'name': 'name',
         'probability': 'probability',
         'planned_revenue': 'amount_usdollar',
@@ -150,16 +154,28 @@ def import_opportunities(surgar_obj, cr, uid, context=None):
         },
     }
     lead_pool = surgar_obj.pool.get('crm.lead')
+    new_opportunity_id = False
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
+    user_id = False
     for val in sugar_data:
-        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
-        stage_id = get_opportunity_status(surgar_obj, cr, uid, val, context)
-        openerp_val = dict(zip(fields,datas))
-        openerp_val['type'] = 'opportunity'
-        openerp_val['user_id'] = user_id
-        openerp_val['stage_id'] = stage_id
-        new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
+       #Need To FIx for Import user data record from sugarcrm.
+       if val.get('assigned_user_name'):
+           user_ids = surgar_obj.pool.get('res.users').search(cr, uid, [('name', '=', val.get("assigned_user_name"))])
+       if not user_ids:
+           user_ids = surgar_obj.pool.get('res.users').create(cr, uid, {'name': val.get('assigned_user_name'), 'login': val.get("assigned_user_name")})
+       if user_ids:
+           if isinstance(user_ids,list):
+               user_id = user_ids[0]
+           else:
+                user_id=user_ids           
+       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
+       stage_id = get_opportunity_status(sugar_obj, cr, uid, val, context)
+       openerp_val = dict(zip(fields,datas))
+       openerp_val['type'] = 'opportunity'
+       openerp_val['user_id'] = user_id
+       openerp_val['stage_id'] = stage_id
+       new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
     return new_opportunity_id
 
 
@@ -177,9 +193,6 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
                      },
           }
 
-
-
-
 class import_sugarcrm(osv.osv):
     """Import SugarCRM DATA"""
 
@@ -220,7 +233,6 @@ class import_sugarcrm(osv.osv):
         keys = self.get_key(cr, uid, ids, context)
         imported = set() #to invoid importing 2 times the sames modules
         for key in keys:
-            print imported
             if not key in imported:
                 self.resolve_dependencies(cr, uid, MAP_FIELDS, MAP_FIELDS[key]['dependencies'], imported, context=context)
                 MAP_FIELDS[key]['process'](self, cr, uid, context)
diff --git a/addons/sugarcrm_syncro/sugar.py b/addons/sugarcrm_syncro/sugar.py
index 1ade81cd493..6e9835823ee 100644
--- a/addons/sugarcrm_syncro/sugar.py
+++ b/addons/sugarcrm_syncro/sugar.py
@@ -57,10 +57,8 @@ def search(portType, sessionid, module_name=None):
   if se_resp:
       list = se_resp._return._entry_list
       for i in list:
-          print "import d'un user"
           ans_dir = {}
           for j in i._name_value_list:
-              print j._name , j._value
               ans_dir[j._name.encode('utf-8')] = j._value.encode('utf-8')
             #end for
           ans_list.append(ans_dir)

From 6362a0955dfcd08208b5e19eddc29268b7edbf3a Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 14 Mar 2011 19:13:30 +0100
Subject: [PATCH 07/11] [FIX] use import data, manage xml id and real id, poc
 of importing user and leads and assigned user to lead

bzr revid: tfr@openerp.com-20110314181330-66m3f2ewa73nvnn0
---
 addons/sugarcrm_syncro/import_sugarcrm.py     | 95 +++++++++----------
 .../sugarcrm_fields_mapping.py                | 10 +-
 2 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index aec2ee2ba64..623a07f1574 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -39,29 +39,33 @@ def find_mapped_id(obj, cr, uid, res_model, sugar_id, context):
     return model_obj.search(cr, uid, [('model', '=', res_model), ('module', '=', 'sugarcrm_import'), ('name', '=', sugar_id)], context=context)
 
 
-def import_users(surgar_obj, cr, uid, context=None):
+def import_users(sugar_obj, cr, uid, context=None):
+    print "Import Users"
     if not context:
         context = {}
-    map_user = {'Users':
-            {'name': ['first_name', 'last_name'],
+    map_user = {'id' : 'id', 
+             'name': ['first_name', 'last_name'],
             'login': 'user_name',
-            'new_password' : 'pwd_last_changed',
-            } ,
-        }
-    new_user_id = False
-    user_obj = surgar_obj.pool.get('res.users')
+            
+            
+            'context_lang' : 'context_lang',
+            'password' : 'password',
+            '.id' : '.id',
+            } 
+    user_obj = sugar_obj.pool.get('res.users')
     PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
     sugar_data = sugar.search(PortType,sessionid, 'Users')
     for val in sugar_data:
         user_ids = user_obj.search(cr, uid, [('login', '=', val.get('user_name'))])
-        if user_ids: #we skip the import of admin but we should save the mapping in ir.model.data
-            #create_mapping(surgar_obj, cr, uid
-            continue
-        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Users', map_user)
-        openerp_val = dict(zip(fields,datas))
-        openerp_val['context_lang'] = context.get('lang','en_US')
-        new_user_id = user_obj.create(cr, uid, openerp_val, context)
-    return new_user_id
+        if user_ids: 
+            val['.id'] = str(user_ids[0])
+        else:
+            val['password'] = 'sugarcrm' #default password for all user
+
+        val['context_lang'] = context.get('lang','en_US')
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, map_user)
+        #All data has to be imported separatly because they don't have the same field
+        user_obj.import_data(cr, uid, fields, [datas], mode='update', current_module='sugarcrm_import', context=context)
 
 def get_lead_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
@@ -86,29 +90,30 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
         context = {}
     stage_id = ''
-    stage_dict = {'sales_stage': #field in the sugarcrm database
-            { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
+    stage_dict = { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
                'Need Analysis': 'New',
                'Closed Lost': 'Lost',
                'Closed Won': 'Won',
                'Value Proposition': 'Proposition',
                 'Negotiation/Review': 'Negotiation'
-            },}
-    stage = stage_dict['sales_stage'].get(sugar_val['sales_stage'], '')
+            }
+    stage = stage_dict.get(sugar_val['sales_stage'], '')
     stage_pool = surgar_obj.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
         stage_id = stage.id
     return stage_id
 
-def import_leads(surgar_obj, cr, uid, context=None):
+def import_leads(sugar_obj, cr, uid, context=None):
+    print "Import Lead"
     if not context:
         context = {}
     map_lead = {
-            'Leads':{'name': ['first_name','last_name'],
-            'contact_name': ['first_name','last_name'],
+            'id' : 'id',
+            'name': ['first_name', 'last_name'],
+            'contact_name': ['first_name', 'last_name'],
             'description': 'description',
-            'partner_name': ['first_name','last_name'],
+            'partner_name': ['first_name', 'last_name'],
             'email_from': 'email1',
             'phone': 'phone_work',
             'mobile': 'phone_mobile',
@@ -117,32 +122,24 @@ def import_leads(surgar_obj, cr, uid, context=None):
             'street': 'primary_address_street',
             'zip': 'primary_address_postalcode',
             'city':'primary_address_city',
-            },
-        }
-    user_id = False
-    lead_pool = surgar_obj.pool.get('crm.lead')
-    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
-    sugar_data = sugar.search(PortType,sessionid, 'Leads')
-    new_lead_id = False
+            'user_id/id' : 'assigned_user_id',
+            
+            
+            'stage_id.id' : 'stage_id.id',
+            'type' : 'type',
+    
+            }
+        
+    lead_obj = sugar_obj.pool.get('crm.lead')
+    PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''))
+    sugar_data = sugar.search(PortType, sessionid, 'Leads')
     for val in sugar_data:
-       #Need To FIx for Import user data record from sugarcrm.
-       if val.get('assigned_user_name'):
-           user_ids = surgar_obj.pool.get('res.users').search(cr, uid, [('name', '=', val.get("assigned_user_name"))])
-       if not user_ids:
-           user_ids = surgar_obj.pool.get('res.users').create(cr, uid, {'name': val.get('assigned_user_name'), 'login': val.get("assigned_user_name")})
-       if user_ids:
-           if isinstance(user_ids,list):
-               user_id = user_ids[0]
-           else:
-                user_id=user_ids                  
-       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Leads', map_lead)
-       stage_id = get_lead_status(surgar_obj, cr, uid, val, context)
-       openerp_val = dict(zip(fields,datas))
-       openerp_val['type'] = 'lead'
-       openerp_val['user_id'] = user_id
-       openerp_val['stage_id'] = stage_id
-       new_lead_id = lead_pool.create(cr, uid, openerp_val, context)
-    return new_lead_id
+        val['type'] = 'lead'
+        stage_id = get_lead_status(sugar_obj, cr, uid, val, context)
+        val['stage_id.id'] = stage_id
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, map_lead)
+        lead_obj.import_data(cr, uid, fields, [datas], mode='update', current_module='sugarcrm_import', context=context)
+
 
 def import_opportunities(surgar_obj, cr, uid, context=None):
     if not context:
diff --git a/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py b/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py
index ecc4534ba4a..b3f1c3002fa 100644
--- a/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py
+++ b/addons/sugarcrm_syncro/sugarcrm_fields_mapping.py
@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
-def sugarcrm_fields_mapp(dict_sugar,openerp_obj,openerp_dict):
+def sugarcrm_fields_mapp(dict_sugar, openerp_dict):
     fields=[]
     data_lst = []
-    for key,val in openerp_dict.get(openerp_obj).items():
-        if key not in fields:
+    for key,val in openerp_dict.items():
+        if key not in fields and dict_sugar.get(isinstance(val, list) and val[0] or val):
             fields.append(key)
             if isinstance(val, list):
-                data_lst.append(dict_sugar.get(val[0],['']) + ' ' + dict_sugar.get(val[1],['']))
+                data_lst.append(' '.join(map(lambda x : dict_sugar[x], val)))
             else:
-                data_lst.append(dict_sugar.get(val,['']))
+                data_lst.append(dict_sugar.get(val,''))
     return fields,data_lst

From 374639a0ed9a78f81745c414fa88da25d813dc0e Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 14 Mar 2011 19:18:25 +0100
Subject: [PATCH 08/11] [CLEAN] clean print + fixes

bzr revid: tfr@openerp.com-20110314181825-osau1mngku7y3h8h
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index 623a07f1574..cd2f9077a95 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -40,7 +40,6 @@ def find_mapped_id(obj, cr, uid, res_model, sugar_id, context):
 
 
 def import_users(sugar_obj, cr, uid, context=None):
-    print "Import Users"
     if not context:
         context = {}
     map_user = {'id' : 'id', 
@@ -105,7 +104,6 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
     return stage_id
 
 def import_leads(sugar_obj, cr, uid, context=None):
-    print "Import Lead"
     if not context:
         context = {}
     map_lead = {
@@ -140,7 +138,7 @@ def import_leads(sugar_obj, cr, uid, context=None):
         fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, map_lead)
         lead_obj.import_data(cr, uid, fields, [datas], mode='update', current_module='sugarcrm_import', context=context)
 
-
+#Need fixes
 def import_opportunities(surgar_obj, cr, uid, context=None):
     if not context:
         context = {}

From df90505d7d530a6fb3ac07a3a8ba7ec708244955 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 15 Mar 2011 15:24:50 +0530
Subject: [PATCH 09/11] [IMP]: Use Import data for opportunity.

bzr revid: atp@tinyerp.com-20110315095450-d2nvf1iukgktq4a4
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 55 +++++++++--------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index cd2f9077a95..b2be8a20262 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -80,7 +80,7 @@ def get_lead_status(surgar_obj, cr, uid, sugar_val,context=None):
         },}
     stage = stage_dict['status'].get(sugar_val['status'], '')
     stage_pool = surgar_obj.pool.get('crm.case.stage')
-    stage_ids = stage_pool.search(cr, uid, [("type", '=', 'lead'), ('name', '=', stage)])
+    stage_ids = stage_pool.search(cr, uid, [('type', '=', 'lead'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
         stage_id = stage.id
     return stage_id
@@ -89,16 +89,18 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
         context = {}
     stage_id = ''
-    stage_dict = { #Mapping of sugarcrm stage : openerp opportunity stage Mapping
+    stage_dict = { 'status':
+            {#Mapping of sugarcrm stage : openerp opportunity stage Mapping
                'Need Analysis': 'New',
                'Closed Lost': 'Lost',
                'Closed Won': 'Won',
                'Value Proposition': 'Proposition',
                 'Negotiation/Review': 'Negotiation'
-            }
-    stage = stage_dict.get(sugar_val['sales_stage'], '')
+            },
+    }
+    stage = stage_dict['status'].get(sugar_val['status'], '')
     stage_pool = surgar_obj.pool.get('crm.case.stage')
-    stage_ids = stage_pool.search(cr, uid, [("type", '=', 'opportunity'), ('name', '=', stage)])
+    stage_ids = stage_pool.search(cr, uid, [('type', '=', 'opportunity'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
         stage_id = stage.id
     return stage_id
@@ -138,40 +140,27 @@ def import_leads(sugar_obj, cr, uid, context=None):
         fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, map_lead)
         lead_obj.import_data(cr, uid, fields, [datas], mode='update', current_module='sugarcrm_import', context=context)
 
-#Need fixes
-def import_opportunities(surgar_obj, cr, uid, context=None):
+def import_opportunities(sugar_obj, cr, uid, context=None):
     if not context:
         context = {}
-    map_opportunity = {'Opportunities':  {'name': 'name',
+    map_opportunity = {'id' : 'id',
+        'name': 'name',
         'probability': 'probability',
         'planned_revenue': 'amount_usdollar',
-        'date_deadline':'date_closed'
-        },
+        'date_deadline':'date_closed',
+        'user_id/id' : 'assigned_user_id',
+        'stage_id.id' : 'stage_id.id',
+        'type' : 'type',
     }
-    lead_pool = surgar_obj.pool.get('crm.lead')
-    new_opportunity_id = False
-    PortType,sessionid = sugar.login(context.get('username',''), context.get('password',''))
-    sugar_data = sugar.search(PortType,sessionid, 'Opportunities')
-    user_id = False
+    lead_obj = sugar_obj.pool.get('crm.lead')
+    PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''))
+    sugar_data = sugar.search(PortType, sessionid, 'Leads')
     for val in sugar_data:
-       #Need To FIx for Import user data record from sugarcrm.
-       if val.get('assigned_user_name'):
-           user_ids = surgar_obj.pool.get('res.users').search(cr, uid, [('name', '=', val.get("assigned_user_name"))])
-       if not user_ids:
-           user_ids = surgar_obj.pool.get('res.users').create(cr, uid, {'name': val.get('assigned_user_name'), 'login': val.get("assigned_user_name")})
-       if user_ids:
-           if isinstance(user_ids,list):
-               user_id = user_ids[0]
-           else:
-                user_id=user_ids           
-       fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, 'Opportunities', map_opportunity)
-       stage_id = get_opportunity_status(sugar_obj, cr, uid, val, context)
-       openerp_val = dict(zip(fields,datas))
-       openerp_val['type'] = 'opportunity'
-       openerp_val['user_id'] = user_id
-       openerp_val['stage_id'] = stage_id
-       new_opportunity_id = lead_pool.create(cr, uid, openerp_val, context)
-    return new_opportunity_id
+        val['type'] = 'opportunity'
+        stage_id = get_opportunity_status(sugar_obj, cr, uid, val, context)
+        val['stage_id.id'] = stage_id
+        fields, datas = sugarcrm_fields_mapping.sugarcrm_fields_mapp(val, map_opportunity)
+        lead_obj.import_data(cr, uid, fields, [datas], mode='update', current_module='sugarcrm_import', context=context)
 
 
 

From 5e3826f0fcb539bd9d10c4d8d28439baa2d30794 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 15 Mar 2011 15:45:57 +0530
Subject: [PATCH 10/11] [FIX]

bzr revid: atp@tinyerp.com-20110315101557-5ndl0usl4t9u9j77
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index b2be8a20262..b8888fd4c3b 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -89,7 +89,7 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
         context = {}
     stage_id = ''
-    stage_dict = { 'status':
+    stage_dict = { 'sales_stage':
             {#Mapping of sugarcrm stage : openerp opportunity stage Mapping
                'Need Analysis': 'New',
                'Closed Lost': 'Lost',
@@ -98,7 +98,7 @@ def get_opportunity_status(surgar_obj, cr, uid, sugar_val,context=None):
                 'Negotiation/Review': 'Negotiation'
             },
     }
-    stage = stage_dict['status'].get(sugar_val['status'], '')
+    stage = stage_dict['sales_stage'].get(sugar_val['sales_stage'], '')
     stage_pool = surgar_obj.pool.get('crm.case.stage')
     stage_ids = stage_pool.search(cr, uid, [('type', '=', 'opportunity'), ('name', '=', stage)])
     for stage in stage_pool.browse(cr, uid, stage_ids, context):
@@ -154,7 +154,7 @@ def import_opportunities(sugar_obj, cr, uid, context=None):
     }
     lead_obj = sugar_obj.pool.get('crm.lead')
     PortType, sessionid = sugar.login(context.get('username', ''), context.get('password', ''))
-    sugar_data = sugar.search(PortType, sessionid, 'Leads')
+    sugar_data = sugar.search(PortType, sessionid, 'Opportunities')
     for val in sugar_data:
         val['type'] = 'opportunity'
         stage_id = get_opportunity_status(sugar_obj, cr, uid, val, context)

From 75eaefe6364ce36e90020e68fd002505eaa6d9ef Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 16 Mar 2011 14:06:42 +0530
Subject: [PATCH 11/11] [FIX]: Fix for write date in Leads

bzr revid: atp@tinyerp.com-20110316083642-yp7laoelz4ip4lop
---
 addons/sugarcrm_syncro/import_sugarcrm.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sugarcrm_syncro/import_sugarcrm.py b/addons/sugarcrm_syncro/import_sugarcrm.py
index b8888fd4c3b..6c7b3fe3cc4 100644
--- a/addons/sugarcrm_syncro/import_sugarcrm.py
+++ b/addons/sugarcrm_syncro/import_sugarcrm.py
@@ -117,7 +117,6 @@ def import_leads(sugar_obj, cr, uid, context=None):
             'email_from': 'email1',
             'phone': 'phone_work',
             'mobile': 'phone_mobile',
-            'write_date':'date_modified',
             'function':'title',
             'street': 'primary_address_street',
             'zip': 'primary_address_postalcode',