[FIX] stock_incoterm_extension: using BoM for sales works (#173)

odoomrp · Oct 17, 2018 · b69c3d7 · b69c3d7
1 parent 4b4667b
commit b69c3d7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/stock_incoterm_extension/__openerp__.py b/stock_incoterm_extension/__openerp__.py
@@ -18,7 +18,7 @@
 
 {
     "name": "Stock Incoterm Extension",
-    "version": "8.0.1.3.0",
+    "version": "8.0.1.4.0",
     "license": "AGPL-3",
     "depends": [
         "stock_account",

diff --git a/stock_incoterm_extension/models/stock.py b/stock_incoterm_extension/models/stock.py
@@ -67,15 +67,17 @@ def _create_invoice_from_picking(self, picking, vals):
 class StockMove(models.Model):
     _inherit = "stock.move"
 
-    @api.multi
-    def action_confirm(self):
-        res = super(StockMove, self).action_confirm()
-        for move in self:
-            if (move.procurement_id and move.procurement_id.sale_line_id):
-                sale = move.procurement_id.sale_line_id.order_id
-                picking = move.picking_id
-                if picking and sale:
-                    picking.incoterm = sale.incoterm
-                    picking.destination_port = sale.destination_port
-                    picking.transport_type = sale.transport_type
-        return res
+    @api.model
+    def _prepare_picking_assign(self, move):
+        """ Prepares a new picking for this move as it could not be assigned to
+        another picking. This method is designed to be inherited.
+        """
+        values = super(StockMove, self)._prepare_picking_assign(move=move)
+        if (move.procurement_id and move.procurement_id.sale_line_id):
+            sale = move.procurement_id.sale_line_id.order_id
+            values.update({
+                'incoterm': sale.incoterm.id,
+                'destination_port': sale.destination_port,
+                'transport_type': sale.transport_type,
+            })
+        return values