Wrong attribute name for the shipping line builder

Fixes OCA#112

magentoerpconnect/sale.py

@@ -890,7 +890,7 @@ def _add_shipping_line(self, map_record, values):
         if values.get('carrier_id'):
             carrier = self.session.browse('delivery.carrier',
                                           values['carrier_id'])
-            line_builder.product_id = carrier.product_id
+            line_builder.product = carrier.product_id
 
         line = (0, 0, line_builder.get_line())
         values['order_line'].append(line)

magentoerpconnect/tests/test_sale_order.py

@@ -175,3 +175,32 @@ def test_copy_quotation_export_state(self):
             self.assertEqual(method, 'sales_order.addComment')
             self.assertEqual(magento_id, binding.magento_id)
             self.assertEqual(state, 'pending')
+
+    def test_import_carrier_product(self):
+        """ Product of a carrier is used in the sale line """
+        cr, uid = self.cr, self.uid
+        product = self.registry('product.product').create(
+            cr, uid, {'name': 'Carrier Product'})
+        self.registry('delivery.carrier').create(
+            cr, uid,
+            {'name': 'Flatrate',
+             'partner_id': self.ref('base.main_partner'),
+             'product_id': product.id,
+             'magento_code': 'flatrate_flatrate',
+             'magento_carrier_code': 'flatrate_flatrate',
+             },
+        )
+        binding = self._import_sale_order(900000691)
+        # check if we have a line with the carrier product,
+        # which is the shipping line
+        shipping_line = False
+        for line in binding.order_line:
+            if line.product_id == product:
+                shipping_line = True
+        self.assertTrue(shipping_line,
+                        msg='No shipping line with the product of the carrier '
+                            'has been found. Line names: %s' %
+                            (', '.join("%s (%s)" % (line.name,
+                                                    line.product_id.name)
+                                       for line
+                                       in binding.order_line),))