[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Thu, 8 Nov 2012 12:32:06 +0000 (13:32 +0100)
committervta vta@openerp.com <>
Thu, 8 Nov 2012 12:32:06 +0000 (13:32 +0100)
commit5d112d629b20bac90902e1acb198265fff4160d0
tree4cdfd9a3a76f41166d53bbc9621590d04218d7ea
parent156ba2f21c3793f0357989a9e75bed8f5fd1c382
parent85448373c8cb4ba78d9b5974ddef0f0cf10960bc
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121108123206-7g866idcg3s58df2
addons/account/account_bank_statement.py
addons/account/account_view.xml
addons/account_voucher/__openerp__.py
addons/account_voucher/account_voucher.py
addons/account_voucher/account_voucher_view.xml
addons/account_voucher/voucher_payment_receipt_view.xml