[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Tue, 7 Feb 2012 22:50:41 +0000 (23:50 +0100)
committerVo Minh Thu <vmt@openerp.com>
Tue, 7 Feb 2012 22:50:41 +0000 (23:50 +0100)
commitdd95deb3690456d15fac27fe9bccd90889082ac2
tree2dcb8ea98004e76b76e236392f032c1f1ec1adfe
parentbf6d569d75f8e4217773ea6f58d231160f32b557
parent628e6d74955239808267d461caa5b0ca8e8ce2d0
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120207225041-z16f5mx27s95o4ql
addons/account/account.py
addons/base_vat/base_vat.py
addons/edi/models/edi.py
addons/email_template/email_template.py
addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
addons/stock/stock.py