[MERGE] lp:807543
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Oct 2011 12:19:34 +0000 (14:19 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Oct 2011 12:19:34 +0000 (14:19 +0200)
commitccdcd1e55f62103227d610673a282839db85bec7
tree2aca1f8007d446c194b16f73f798e748db422a71
parent679983672d9afe72e6a19494598b8eb558dcd8cc
parentd15fa3f93375ca15596931132903f3f3dcaf0c11
[MERGE] lp:807543

bzr revid: qdp-launchpad@openerp.com-20111018121934-0k482zv4jxtp0uyb
addons/account/account_invoice_view.xml
addons/account_cancel/account_cancel_view.xml