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

2 files changed, 41 insertions, 2 deletions

diff --git a/addons/base_import/models/base_import.py b/addons/base_import/models/base_import.py
index 720cdc1e71a..542283903f1 100644
--- a/addons/base_import/models/base_import.py
+++ b/addons/base_import/models/base_import.py
@@ -597,9 +597,18 @@ class Import(models.TransientModel):
 
     @api.multi
     def _parse_import_data(self, data, import_fields, options):
+        """ Lauch first call to _parse_import_data_recursive with an
+        empty prefix. _parse_import_data_recursive will be run
+        recursively for each relational field.
+        """
+        return self._parse_import_data_recursive(self.res_model, '', data, import_fields, options)
+
+    @api.multi
+    def _parse_import_data_recursive(self, model, prefix, data, import_fields, options):
         # Get fields of type date/datetime
-        all_fields = self.env[self.res_model].fields_get()
+        all_fields = self.env[model].fields_get()
         for name, field in all_fields.items():
+            name = prefix + name
             if field['type'] in ('date', 'datetime') and name in import_fields:
                 # Parse date
                 index = import_fields.index(name)
@@ -618,7 +627,11 @@ class Import(models.TransientModel):
                                 raise ValueError(_("Column %s contains incorrect values. Error in line %d: %s") % (name, num + 1, e))
                             except Exception as e:
                                 raise ValueError(_("Error Parsing Date [%s:L%d]: %s") % (name, num + 1, e))
-
+            # Check if the field is in import_field and is a relational (followed by /)
+            # Also verify that the field name exactly match the import_field at the correct level.
+            elif any(name + '/' in import_field and name == import_field.split('/')[prefix.count('/')] for import_field in import_fields):
+                # Recursive call with the relational as new model and add the field name to the prefix
+                self._parse_import_data_recursive(field['relation'], name + '/', data, import_fields, options)
             elif field['type'] in ('float', 'monetary') and name in import_fields:
                 # Parse float, sometimes float values from file have currency symbol or () to denote a negative value
                 # We should be able to manage both case
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,