merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 11:38:58 +0000 (13:38 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 11:38:58 +0000 (13:38 +0200)
commitd06ae0b38e683e0e3cc9a70a699ea152a90811c6
tree4dc6ee7aaab067fe53ec943304dbf8052ac4b1ad
parent3d97bddb638ec273877224bcc82ec38d62b3f2ec
parentc6c0ca1207ba38e8fa5ea6b3fa61a5c9932eb156
merge

bzr revid: fp@tinyerp.com-20110924113858-o4w6azzu3maybtg5
addons/account_voucher/voucher_sales_purchase_view.xml
addons/purchase/report/order.rml