Forward port of 7.0 up to rev 9b87d6f

diff --cc addons/event/event.py
Simple merge

diff --cc addons/purchase/stock.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge