diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml index cd4cf1685592a301a872ff8295d49d057abcaaf7..dd5d2c32f12d76cba8d9bc83d76f5d387c544f1c 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getCategoriesSpreadSheetMapping.xml @@ -174,7 +174,7 @@ for table_name in spreadsheets.keys():\n # started, that seems the path definition has ended\n if \'path_0\' in property_map.values():\n path_index == None\n - property_map[column_index] = column_id\n + property_map[column_index] = column_id.encode(\'utf8\')\n column_index += 1\n \n # Construct categories data (with absolute path) from table lines\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index e517ae7abfeb03256eb2967ed960048ee4dadeb6..7e752471bfa3b8caabafb3764cb3ebfac522052b 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -917 \ No newline at end of file +918 \ No newline at end of file diff --git a/product/ERP5OOo/tests/testOOoImport.py b/product/ERP5OOo/tests/testOOoImport.py index 0f295084274024bb3c637a722dd2cf9b06f4e252..10ade50bafe6657dbff8e8cade0ec8a7ac9c597a 100644 --- a/product/ERP5OOo/tests/testOOoImport.py +++ b/product/ERP5OOo/tests/testOOoImport.py @@ -220,6 +220,8 @@ class TestOOoImport(ERP5TypeTestCase): # strings are encoded in UTF8 self.assertTrue(isinstance(region[1]['title'], str)) self.assertTrue(isinstance(region[1]['path'], str)) + for k in region[1].keys(): + self.assertTrue(isinstance(k, str), (k, type(k))) def test_CategoryTool_importCategoryFile(self): # tests simple use of CategoryTool_importCategoryFile script