OLD 7.0 2015 09 26

Conflict:

diff --cc addons/stock/stock.py
index 265f2e3,7fa2f4e..0000000
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1145,8 -1133,7 +1145,12 @@@ class stock_picking(osv.osv)
          res = {}
          inv_type = type
          for picking_id in ids:
++<<<<<<< HEAD
 +            # We browse INSIDE THE LOOP in order to avoid this bug:
 +            # https://github.com/odoo/odoo/issues/4201
++=======
+             # The browse inside the loop is done on purpose, as a change in the pickings during the loop is possible
++>>>>>>> odoo/7.0
              picking = self.browse(cr, uid, picking_id, context=context)                                                                                                   
              if picking.invoice_state != '2binvoiced':                                                                                                                     
                  continue

resolved by

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 265f2e3..f8d547b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1145,8 +1145,7 @@ class stock_picking(osv.osv):
         res = {}
         inv_type = type
         for picking_id in ids:
-            # We browse INSIDE THE LOOP in order to avoid this bug:
-            # https://github.com/odoo/odoo/issues/4201
+            # The browse inside the loop is done on purpose, as a change in the pickings during the loop is possible
             picking = self.browse(cr, uid, picking_id, context=context)
             if picking.invoice_state != '2binvoiced':
                 continue

in https://github.com/OCA/OCB/commit/0a182c4 by @hbrunn