From a9bb57deba56ada4df46e104acba0a9f6c6cd6cd Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 4 Apr 2011 17:25:21 +0530
Subject: [PATCH] [FIX]: fix Required Field problem in sugarcrm

bzr revid: atp@tinyerp.com-20110404115521-r3zsnwybk5j1izcx
---
 addons/import_sugarcrm/import_sugarcrm.py             | 1 -
 addons/import_sugarcrm/sugarcrm_fields_mapping.py     | 4 ++--
 addons/import_sugarcrm/wizard/sugarcrm_login_view.xml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index a1d897183bb..dc6af718ba6 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -490,7 +490,6 @@ MAP_FIELDS = {'Opportunities':  #Object Mapping name
                     {'dependencies' : ['Users'],  #Object to import before this table
                      'process' : import_partners,
                     },
-                          
               'Users': 
                     {'dependencies' : [],
                      'process' : import_users,
diff --git a/addons/import_sugarcrm/sugarcrm_fields_mapping.py b/addons/import_sugarcrm/sugarcrm_fields_mapping.py
index b3f1c3002fa..e7c3993e33e 100644
--- a/addons/import_sugarcrm/sugarcrm_fields_mapping.py
+++ b/addons/import_sugarcrm/sugarcrm_fields_mapping.py
@@ -23,9 +23,9 @@ def sugarcrm_fields_mapp(dict_sugar, openerp_dict):
     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,''))
diff --git a/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml b/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml
index cb09a3efc10..517cb3e6a4d 100644
--- a/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml
+++ b/addons/import_sugarcrm/wizard/sugarcrm_login_view.xml
@@ -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>