Merge lp:~camptocamp/product-kitting/7.0-fix_1293524-afe into lp:product-kitting

[Alexandre Fayolle - camptocamp]

[FIX] sale_bom_split: don't ignore picking_id in _create_pickings_and_procurements

[lp:~camptocamp/product-kitting/7.0-fix_1293524-afe]

8. By Alexandre Fayolle - camptocamp on 2014-03-17

[FIX] sale_bom_split: import statements

9. By Alexandre Fayolle - camptocamp on 2014-03-17

[IMP] sale_bom_split: updated __openerp__.py to 7.0 standards

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

I also updated the module to 7.0 standards

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks

review: Approve (code review, no tests)

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

I prefer do "from openerp.osv import orm" and then "class xxx(orm.Model)" to be more recognisable and avoid name collisions (very strange), but it's also good this way.

Regards.

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

[lp:~camptocamp/product-kitting/7.0-fix_1293524-afe]

10. By Guewen Baconnier @ Camptocamp on 2014-03-21

merge from master

=== modified file 'sale_bom_split/__init__.py'
--- sale_bom_split/__init__.py	2012-07-24 12:27:35 +0000
+++ sale_bom_split/__init__.py	2014-03-21 14:15:23 +0000
@@ -19,5 +19,5 @@
 #
 ##############################################################################
 
-import sale
+from . import sale
 

=== modified file 'sale_bom_split/sale.py'
--- sale_bom_split/sale.py	2014-03-17 16:24:00 +0000
+++ sale_bom_split/sale.py	2014-03-21 14:15:23 +0000
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-import netsvc
-from osv.orm import Model
+from openerp import netsvc
+from openerp.osv.orm import Model
 
 
 class sale_order(Model):
@@ -104,8 +104,7 @@
         # if we have at least one line which have to be split
         # we prepare the picking so we'll be able to bind it
         # to the move lines
-        picking_id = False
-        if bom_order_lines:
+        if bom_order_lines and not picking_id:
             picking_id = picking_obj.create(
                 cr, uid, self._prepare_order_picking(cr, uid, order, context=context))