Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
commit025f1f1aabb094b4df8ba81eb1f5dd9d7a533758
tree800448aa8e487b6db3729e6b11ecbb8991b71056
parentd69793a1a0ce7040a1c847631e583728ca3c4290
parent922a52dcde24749aa3e640a940be462b85c075dd
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/purchase/purchase.py
addons/stock/stock.py
addons/web/static/src/js/view_form.js