Merge remote-tracking branch 'odoo/7.0' into 7.0

Conflicts:
	addons/stock/stock.py

addons/mail/mail_mail.py

@@ -26,6 +26,8 @@
 from urllib import urlencode
 from urlparse import urljoin
 
+import psycopg2
+
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
@@ -338,6 +340,12 @@ def send(self, cr, uid, ids, auto_commit=False, recipient_ids=None, context=None
                 # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job
                 # instead of marking the mail as failed
                 raise
+            except psycopg2.Error:
+                # If an error with the database occurs, chances are that the cursor is unusable.
+                # This will lead to an `psycopg2.InternalError` being raised when trying to write
+                # `state`, shadowing the original exception and forbid a retry on concurrent
+                # update. Let's bubble it.
+                raise
             except Exception:
                 _logger.exception('failed sending mail.mail %s', mail.id)
                 mail.write({'state': 'exception'})

addons/stock/stock.py

@@ -1145,8 +1145,7 @@ def action_invoice_create(self, cr, uid, ids, journal_id=False,
         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