From fdba99aaeb3998b6f1e76e69fc77bf45b0c73ee2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 20 Sep 2012 13:09:14 +0200
Subject: [PATCH] [ADD] inline o2m LINK_TO (m2m-style)

bzr revid: xmo@openerp.com-20120920110914-hy2rtivhn9cs5wuc
---
 openerp/addons/base/ir/ir_fields.py           | 13 ++++++++--
 .../addons/test_impex/tests/test_load.py      | 24 ++++++++++---------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/ir/ir_fields.py b/openerp/addons/base/ir/ir_fields.py
index 44351229c26..ae0d33298ca 100644
--- a/openerp/addons/base/ir/ir_fields.py
+++ b/openerp/addons/base/ir/ir_fields.py
@@ -204,10 +204,19 @@ class ir_fields_converter(orm.Model):
             ids.append(id)
 
         return [(6, 0, ids)]
-    def _str_to_one2many(self, cr, uid, model, column, value, context=None):
+    def _str_to_one2many(self, cr, uid, model, column, records, context=None):
         commands = []
 
-        for record in value:
+        if len(records) == 1 and exclude_ref_fields(records[0]) == {}:
+            # only one row with only ref field, field=ref1,ref2,ref3 as in
+            # m2o/m2m
+            record = records[0]
+            subfield = self._referencing_subfield(record)
+            # transform [{subfield:ref1,ref2,ref3}] into
+            # [{subfield:ref1},{subfield:ref2},{subfield:ref3}]
+            records = ({subfield:item} for item in record[subfield].split(','))
+
+        for record in records:
             id = None
             refs = only_ref_fields(record)
             # there are ref fields in the record
diff --git a/openerp/tests/addons/test_impex/tests/test_load.py b/openerp/tests/addons/test_impex/tests/test_load.py
index 25159dcd2ba..9ce0d5628ed 100644
--- a/openerp/tests/addons/test_impex/tests/test_load.py
+++ b/openerp/tests/addons/test_impex/tests/test_load.py
@@ -850,6 +850,8 @@ class test_o2m(ImporterCase):
             'this is the rhythm'.split())
 
     def test_link_inline(self):
+        """ m2m-style specification for o2ms
+        """
         id1 = self.registry('export.one2many.child').create(self.cr, openerp.SUPERUSER_ID, {
             'str': 'Bf', 'value': 109
         })
@@ -857,17 +859,17 @@ class test_o2m(ImporterCase):
             'str': 'Me', 'value': 262
         })
 
-        try:
-            self.import_(['const', 'value/.id'], [
-                ['42', '%d,%d' % (id1, id2)]
-            ])
-            self.fail("Should have raised a valueerror")
-        except ValueError, e:
-            # should be Exception(Database ID doesn't exist: export.one2many.child : $id1,$id2)
-            self.assertIs(type(e), ValueError)
-            self.assertEqual(
-                e.args[0],
-                "invalid literal for int() with base 10: '%d,%d'" % (id1, id2))
+        ids, messages = self.import_(['const', 'value/.id'], [
+            ['42', '%d,%d' % (id1, id2)]
+        ])
+        self.assertFalse(messages)
+        self.assertEqual(len(ids), 1)
+
+        [b] = self.browse()
+        self.assertEqual(b.const, 42)
+        # automatically forces link between core record and o2ms
+        self.assertEqual(values(b.value), [109, 262])
+        self.assertEqual(values(b.value, field='parent_id'), [b, b])
 
     def test_link(self):
         """ O2M relating to an existing record (update) force a LINK_TO as well