[MERGE] forward port of branch 7.0 up to e5533d0
authorChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 13:32:32 +0000 (15:32 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 13:32:32 +0000 (15:32 +0200)
commitbf53aeda9436310f493a77fc24f8cc35f362ec5b
treebb21a7bb03af4fe33704bea934b5145e1c702feb
parent5023816c5577b312b06f04355365f1243ed2cdc9
parente5533d0c14cb107a73f85c7e5a76727be8fbc13a
[MERGE] forward port of branch 7.0 up to e5533d0
addons/mrp/mrp.py
addons/web/static/src/js/formats.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list_editable.js