[MERGE] forward port of branch 7.0 up to d36c8b5
authorDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 13:56:45 +0000 (14:56 +0100)
committerDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 13:56:45 +0000 (14:56 +0100)
commit22f2728d22dfdf0a8a0046081a098cb5df64b724
tree4e886e8b0416536a8dfa4c08095214d87b6acf27
parentec277732fec3cb527e508161c4218b16927e0327
parentd36c8b5c9bf7ab9215bc63db6ee49bec5e5b225b
[MERGE] forward port of branch 7.0 up to d36c8b5
addons/account_asset/account_asset.py
addons/web/static/src/js/view_form.js