Merge lp:~unifield-team/unifield-wm/us-177 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/us-177]

2462. By Quentin THEURET @Amaris on 2015-04-02

US-177 [FIX] Mass Theoretical Kit import error if the value in Active cell is True

=== modified file 'kit/wizard/kit_mass_import.py'
--- kit/wizard/kit_mass_import.py	2015-03-26 15:22:42 +0000
+++ kit/wizard/kit_mass_import.py	2015-04-02 14:03:26 +0000
@@ -234,11 +234,14 @@
                   #9: Product UoM (if not set, take the Product Default UoM)
                 """
                 for line, val in values.iteritems():
+                    vval = val[3]
+                    if isinstance(val[3], str):
+                        vval = val[3].strip()
                     kit_key = '%s_%s' % (val[0], val[2])
                     tkc_values.setdefault(kit_key, {
                         'code': val[0],
                         'version': val[2],
-                        'active': val[3].strip() in active_values and True or False,
+                        'active': vval in active_values and True or False,
                         'items': [],
                     })
                     tkc_values[kit_key]['items'].append({
@@ -311,7 +314,10 @@
 
             # Col. 4 :: Active (expected values: True or False)a
             active_values = [True, False, 'True', 'False', 'TRUE', 'FALSE']
-            if not val[3] or val[3].strip() not in active_values:
+            vval = val[3]
+            if isinstance(vval, str):
+                vval = vval.strip()
+            if not vval or vval not in active_values:
                 warning_index.add(line)
                 warning_msg.setdefault(line, [])
                 warning_msg[line].append(