[MERGE] forward port of branch 7.0 up to 7307227

diff --cc addons/account_payment/account_move_line.py
Simple merge

diff --cc addons/mrp/stock.py
index 0ebc7bd,51c2376..c76b54d
--- 1/addons/mrp/stock.py
--- 2/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@@ -156,11 -160,14 +156,13 @@@ class StockPicking(osv.osv)
      def action_explode(self, cr, uid, move_ids, *args):
          """Explodes moves by expanding kit components"""
          move_obj = self.pool.get('stock.move')
-         todo = move_ids[:]
+         todo = list(super(StockPicking, self).action_explode(cr, uid, move_ids, *args))
          for move in move_obj.browse(cr, uid, move_ids):
-             todo.extend(move_obj._action_explode(cr, uid, move))
+             result = move_obj._action_explode(cr, uid, move)
+             moves = move_obj.browse(cr, uid, result)
+             todo.extend(move.id for move in moves if move.state not in ['confirmed', 'assigned', 'done'])
          return list(set(todo))
  
 -StockPicking()
  
  
  class split_in_production_lot(osv.osv_memory):

diff --cc addons/web/static/src/js/views.js
Simple merge