[MERGE] forward port branch saas-16 up to dc2a6c6cd2a

1 files changed, 26 insertions, 0 deletions

diff --git a/addons/base_import/tests/test_base_import.py b/addons/base_import/tests/test_base_import.py
index a59cfa9205c..55f3300da91 100644
--- a/addons/base_import/tests/test_base_import.py
+++ b/addons/base_import/tests/test_base_import.py
@@ -400,7 +400,33 @@ class test_convert_import_data(TransactionCase):
         # if results empty, no errors
         self.assertItemsEqual(results, [])
 
+    def test_parse_relational_fields(self):
+        """ Ensure that relational fields float and date are correctly
+        parsed during the import call.
+        """
+        import_wizard = self.env['base_import.import'].create({
+            'res_model': 'res.partner',
+            'file': u'name,parent_id/id,parent_id/date,parent_id/credit_limit\n'
+                    u'"foo","__export__.res_partner_1","2017年10月12日","5,69"\n'.encode('utf-8'),
+            'file_type': 'text/csv'
 
+        })
+        options = {
+            'date_format': '%Y年%m月%d日',
+            'quoting': '"',
+            'separator': ',',
+            'float_decimal_separator': ',',
+            'float_thousand_separator': '.',
+            'headers': True
+        }
+        data, import_fields = import_wizard._convert_import_data(
+            ['name', 'parent_id/.id', 'parent_id/date', 'parent_id/credit_limit'],
+            options
+        )
+        result = import_wizard._parse_import_data(data, import_fields, options)
+        # Check if the data 5,69 as been correctly parsed.
+        self.assertEqual(float(result[0][-1]), 5.69)
+        self.assertEqual(str(result[0][-2]), '2017-10-12')
 
     def test_filtered(self):
         """ If ``False`` is provided as field mapping for a column,