openerp-dev-web team mailing list archive

["Atul Patel\(OpenERP\)" <atp@xxxxxxxxxxx>]

Atul Patel(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs3_correction2-atp into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs3_correction2-atp/+merge/56877

Hello,
I had made Following correction :

1) Fix Required Field issue for sugarcrm in openerp.

2) Fix Return value and buidbot warning.

kindly check it.

Thanks

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlogs3_correction2-atp/+merge/56877
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm.

=== modified file 'import_sugarcrm/import_sugarcrm.py'
--- import_sugarcrm/import_sugarcrm.py	2011-04-04 09:09:21 +0000
+++ import_sugarcrm/import_sugarcrm.py	2011-04-08 05:50:51 +0000
@@ -35,6 +35,7 @@
     }
     model_obj = obj.pool.get('ir.model.data')
     model_obj.create(cr, uid, model_data, context=context)
+    return True
 
 def find_mapped_id(obj, cr, uid, res_model, sugar_id, context):
     model_obj = obj.pool.get('ir.model.data')
@@ -106,14 +107,14 @@
 def get_users_department(sugar_obj, cr, uid, val, context=None):
     if not context:
        context={}
-    department_id = False
+    department_id = False       
     department_obj = sugar_obj.pool.get('hr.department')
     department_ids = department_obj.search(cr, uid, [('name', '=', val)])
     if department_ids:
         department_id = department_ids[0]
     elif val:
         department_id = department_obj.create(cr, uid, {'name': val})
-    return department_id    
+    return department_id 
 
 def import_users(sugar_obj, cr, uid, context=None):
     if not context:
@@ -148,7 +149,7 @@
 def get_lead_status(surgar_obj, cr, uid, sugar_val,context=None):
     if not context:
         context = {}
-    stage_id = ''
+    stage_id = False
     stage_dict = {'status': #field in the sugarcrm database
         { #Mapping of sugarcrm stage : openerp opportunity stage
             'New' : 'New',
@@ -221,7 +222,8 @@
     else:        
         new_address_id = address_obj.create(cr,uid, dict_val)
         return new_address_id
-    
+    return True
+
 def get_address_type(sugar_obj, cr, uid, val, map_partner_address, type, context=None):
         address_obj = sugar_obj.pool.get('res.partner.address')
         new_address_id = False
@@ -271,6 +273,7 @@
         if val.get('shipping_address_street'):
             address_id.append(get_address_type(sugar_obj, cr, uid, val, map_partner_address, 'delivery', context))
         return address_id
+    return True
 
 def import_partners(sugar_obj, cr, uid, context=None):
     if not context:
@@ -359,8 +362,8 @@
 def get_contact_title(sugar_obj, cr, uid, salutation, domain, context=None):
     if not context:
         context = {}
-    contact_title_obj = sugar_obj.pool.get('res.partner.title')        
-    title_id = False
+    contact_title_obj = sugar_obj.pool.get('res.partner.title')
+    title_id = False            
     title_ids = contact_title_obj.search(cr, uid, [('shortcut', '=', salutation), ('domain', '=', domain)])
     if title_ids:
          title_id = title_ids[0]
@@ -413,7 +416,7 @@
 def get_opportunity_contact(sugar_obj,cr,uid, PortType, sessionid, val, partner_xml_id, context=None):
     if not context:
         context={}
-    partner_contact_name = False
+    partner_contact_name = False        
     model_obj = sugar_obj.pool.get('ir.model.data')
     partner_address_obj = sugar_obj.pool.get('res.partner.address')
     sugar_opportunity_contact = sugar.relation_search(PortType, sessionid, 'Opportunities', module_id=val.get('id'), related_module='Contacts', query=None, deleted=None)
@@ -426,7 +429,7 @@
             partner_contact_name = address_id.name
         else:
             partner_contact_name = val.get('account_name')    
-    return partner_contact_name
+    return partner_contact_name 
 
 def import_opportunities(sugar_obj, cr, uid, context=None):
     if not context:
@@ -487,7 +490,6 @@
                     {'dependencies' : ['Users'],  #Object to import before this table
                      'process' : import_partners,
                     },
-                          
               'Users': 
                     {'dependencies' : [],
                      'process' : import_users,

=== modified file 'import_sugarcrm/sugarcrm_fields_mapping.py'
--- import_sugarcrm/sugarcrm_fields_mapping.py	2011-03-14 18:13:30 +0000
+++ import_sugarcrm/sugarcrm_fields_mapping.py	2011-04-08 05:50:51 +0000
@@ -23,9 +23,9 @@
     fields=[]
     data_lst = []
     for key,val in openerp_dict.items():
-        if key not in fields and dict_sugar.get(isinstance(val, list) and val[0] or val):
+        if key not in fields and dict_sugar:
             fields.append(key)
-            if isinstance(val, list):
+            if isinstance(val, list) and val:
                 data_lst.append(' '.join(map(lambda x : dict_sugar[x], val)))
             else:
                 data_lst.append(dict_sugar.get(val,''))

=== modified file 'import_sugarcrm/wizard/sugarcrm_login_view.xml'
--- import_sugarcrm/wizard/sugarcrm_login_view.xml	2011-04-01 05:45:46 +0000
+++ import_sugarcrm/wizard/sugarcrm_login_view.xml	2011-04-08 05:50:51 +0000
@@ -22,7 +22,7 @@
                         <label string="" colspan="2"/>
                         <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
                         <button name="open_import" string="_Login"
-                                type="object" icon="gtk-ok"/>
+                                type="object" icon="terp-camera_test"/>
                    </group>
                 </form>
             </field>