Merge lp:~midwest/magentoerpconnect/bundle_fix into lp:magentoerpconnect/oerp6.1-stable

[Kyle Waid]

Fix bundle_split module

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

thanks

=== modified file 'magentoerpconnect_bundle_split/sale.py'
--- magentoerpconnect_bundle_split/sale.py	2012-03-27 09:40:33 +0000
+++ magentoerpconnect_bundle_split/sale.py	2012-05-23 17:47:18 +0000
@@ -47,15 +47,15 @@
         else:
             return super(sale_order, self)._merge_sub_items(cr, uid, product_type,
                                             top_item, child_items, context=context)
-
-    def oe_create(self, cr, uid, vals,
-                  external_referential_id, defaults=None, context=None):
-
-        order_id = super(sale_order, self).\
-            oe_create(cr, uid, vals,
-                      external_referential_id,
-                      defaults=defaults,
-                      context=context)
+    def oe_create(self, cr, uid, 
+		  external_session, vals, resource, defaults, context):
+
+	order_id = super(sale_order, self).\
+	    oe_create(cr, uid, external_session,
+		      vals, 
+		      resource, 
+		      defaults=defaults, 
+		      context=context)
 
         order_line_obj = self.pool.get('sale.order.line')
         order = self.browse(cr, uid, order_id, context=context)

=== modified file 'magentoerpconnect_bundle_split/stock.py'
--- magentoerpconnect_bundle_split/stock.py	2012-03-15 09:47:04 +0000
+++ magentoerpconnect_bundle_split/stock.py	2012-05-23 17:47:18 +0000
@@ -26,7 +26,7 @@
 
     _inherit = 'stock.picking'
 
-    def create_ext_shipping(self, cr, uid, id,picking_type,
+    def create_ext_shipping(self, cr, uid, id, picking_type,
                             external_referential_id, context):
         """
         Create the shipping on Magento. It can be a partial