Commit 693901e4 authored by Jérome Perrin's avatar Jérome Perrin

annotations on cells where not handled correctly


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28430 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ef01cca8
...@@ -462,7 +462,7 @@ class OOoParser(Implicit): ...@@ -462,7 +462,7 @@ class OOoParser(Implicit):
elif value_type in ('float', 'percentage', 'currency'): elif value_type in ('float', 'percentage', 'currency'):
cell_data = cell.xpath('./@*[local-name()="value"]')[0].value cell_data = cell.xpath('./@*[local-name()="value"]')[0].value
else: else:
text_tags = cell.xpath('.//*[name() = "text:p"]') text_tags = cell.xpath('./*[name() = "text:p"]')
if len(text_tags): if len(text_tags):
cell_data = ''.join([text.xpath('string(.)') cell_data = ''.join([text.xpath('string(.)')
for text in text_tags]) for text in text_tags])
......
...@@ -854,6 +854,8 @@ class TestOOoImport(ERP5TypeTestCase): ...@@ -854,6 +854,8 @@ class TestOOoImport(ERP5TypeTestCase):
['2008-11-14T10:20:30']) # supported by DateTime ['2008-11-14T10:20:30']) # supported by DateTime
self.assertEquals(mapping['Feuille1'][5], self.assertEquals(mapping['Feuille1'][5],
['PT12H34M56S']) # maybe not good, this is raw format ['PT12H34M56S']) # maybe not good, this is raw format
self.assertEquals(mapping['Feuille1'][6],
['With note'])
# Base_getCategoriesSpreadSheetMapping tests # Base_getCategoriesSpreadSheetMapping tests
def test_Base_getCategoriesSpreadSheetMapping(self): def test_Base_getCategoriesSpreadSheetMapping(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment