[MERGE] forward port of branch saas-3 up to 22f2728
authorDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 14:03:43 +0000 (15:03 +0100)
committerDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 14:03:43 +0000 (15:03 +0100)
commitb7c912ec68fd81f76ee9c14d87eacd019f541092
treea735a24f60ec3f1944cbd4899c892517bd69cfd1
parentd039249dd2e25eb0fe55dc170ae3c3d8a02ed21a
parent22f2728d22dfdf0a8a0046081a098cb5df64b724
[MERGE] forward port of branch saas-3 up to 22f2728
addons/account_asset/account_asset.py
addons/web/static/src/js/view_form.js