[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com...
authorDenis Ledoux <dle@openerp.com>
Wed, 9 Apr 2014 16:31:32 +0000 (18:31 +0200)
committerDenis Ledoux <dle@openerp.com>
Wed, 9 Apr 2014 16:31:32 +0000 (18:31 +0200)
commit7715bf1823a93d6efee1bf60d091f194e0ed6a34
tree924b33411ce44d6399f08a77681a10439831d415
parentce83eb09682a1e39e77eefc4291b04f0105c1ada
parentc28a5a1021a568fa1a60011f2a5ff7b6c9005829
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2

bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
addons/account_asset/account_asset.py
addons/pad/static/src/js/pad.js