[MERGE] forward port of branch 7.0 up to 9c77f79
authorDenis Ledoux <dle@odoo.com>
Tue, 23 Sep 2014 17:01:11 +0000 (19:01 +0200)
committerDenis Ledoux <dle@odoo.com>
Tue, 23 Sep 2014 17:01:11 +0000 (19:01 +0200)
commitc57ca80a5bd2165d0464af921b1c6e03c372fe19
tree1e4840662c4ea7be8c3b6bc39b83f5658125dc49
parentcaf1ad8a6218a99222777912253dc038073aef3e
parent9c77f794b44a0b18d548385ae3ec9f49c6f85a94
[MERGE] forward port of branch 7.0 up to 9c77f79
addons/account_voucher/account_voucher.py
addons/account_voucher/wizard/account_statement_from_invoice.py
addons/auth_ldap/users_ldap.py
addons/web/static/src/js/view_form.js