From 693901e42823bd5514e19b009a7dafc1387d459c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 18 Aug 2009 07:34:33 +0000
Subject: [PATCH] annotations on cells where not handled correctly

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28430 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5OOo/OOoUtils.py                   |   2 +-
 product/ERP5OOo/tests/testOOoImport.py        |   2 ++
 .../import_data_list_data_type.ods            | Bin 9069 -> 8620 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/product/ERP5OOo/OOoUtils.py b/product/ERP5OOo/OOoUtils.py
index cf61e79bba..59f453104a 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 ca09bc4be6..b3213b922c 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
GIT binary patch
delta 6715
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
AtN;K2

delta 7117
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
a75!&z{@g*b|5$#xj|AwM@7nw|kpBY)we{Bk

-- 
2.30.9