[Erp5-report] r28430 - in /erp5/trunk/products/ERP5OOo: ./ tests/ tests/test_document/

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Aug 18 09:34:33 2009
New Revision: 28430

URL: http://svn.erp5.org?rev=28430&view=rev
Log:
annotations on cells where not handled correctly

Modified:
    erp5/trunk/products/ERP5OOo/OOoUtils.py
    erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
    erp5/trunk/products/ERP5OOo/tests/test_document/import_data_list_data_type.ods

Modified: erp5/trunk/products/ERP5OOo/OOoUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoUtils.py?rev=28430&r1=28429&r2=28430&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoUtils.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/OOoUtils.py [utf8] Tue Aug 18 09:34:33 2009
@@ -462,7 +462,7 @@
             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])

Modified: erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoImport.py?rev=28430&r1=28429&r2=28430&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] Tue Aug 18 09:34:33 2009
@@ -854,6 +854,8 @@
                       ['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):

Modified: erp5/trunk/products/ERP5OOo/tests/test_document/import_data_list_data_type.ods
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/test_document/import_data_list_data_type.ods?rev=28430&r1=28429&r2=28430&view=diff
==============================================================================
Binary files - no diff available.