diff --git a/product/ERP5OOo/OOoUtils.py b/product/ERP5OOo/OOoUtils.py index cf61e79bba7061405a6eaa423e33c94e05a0a939..59f453104ae00cad0a104397f876d2e10d79bbb9 100644 --- a/product/ERP5OOo/OOoUtils.py +++ b/product/ERP5OOo/OOoUtils.py @@ -462,7 +462,7 @@ class OOoParser(Implicit): elif value_type in ('float', 'percentage', 'currency'): cell_data = cell.xpath('./@*[local-name()="value"]')[0].value else: - text_tags = cell.xpath('.//*[name() = "text:p"]') + text_tags = cell.xpath('./*[name() = "text:p"]') if len(text_tags): cell_data = ''.join([text.xpath('string(.)') for text in text_tags]) diff --git a/product/ERP5OOo/tests/testOOoImport.py b/product/ERP5OOo/tests/testOOoImport.py index ca09bc4be601ad74d533fb79ccafe4b7fdd4bb3d..b3213b922c229dfac5bf15f0c69c104fbf6dec9f 100644 --- a/product/ERP5OOo/tests/testOOoImport.py +++ b/product/ERP5OOo/tests/testOOoImport.py @@ -854,6 +854,8 @@ class TestOOoImport(ERP5TypeTestCase): ['2008-11-14T10:20:30']) # supported by DateTime self.assertEquals(mapping['Feuille1'][5], ['PT12H34M56S']) # maybe not good, this is raw format + self.assertEquals(mapping['Feuille1'][6], + ['With note']) # Base_getCategoriesSpreadSheetMapping tests def test_Base_getCategoriesSpreadSheetMapping(self): diff --git a/product/ERP5OOo/tests/test_document/import_data_list_data_type.ods b/product/ERP5OOo/tests/test_document/import_data_list_data_type.ods index 7ef5bad7f9c3021d5da100cdc958fb8a6b3634a9..2426c4defc8c7b46f8e1d38945993dde533a94f5 100644 Binary files a/product/ERP5OOo/tests/test_document/import_data_list_data_type.ods and b/product/ERP5OOo/tests/test_document/import_data_list_data_type.ods differ