[MERGE] forward port of branch 7.0 up to 78a29b3
authorChristophe Simonis <chs@odoo.com>
Tue, 21 Oct 2014 11:06:27 +0000 (13:06 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 21 Oct 2014 11:06:27 +0000 (13:06 +0200)
commit22c390285f7ec44fb0b67ade35ce6c9f39c71f8e
tree4e4e5c8584a55421a6018c32c29b4d84681b7887
parentedc4b0b9bb87aeae2e923a5a0d93e12ee171906d
parent78a29b3738c14ccc8b042de1d95f502e4bc282ef
[MERGE] forward port of branch 7.0 up to 78a29b3
addons/account_followup/account_followup.py
addons/mail/mail_thread.py
addons/point_of_sale/report/pos_order_report.py
addons/sale/wizard/sale_make_invoice_advance.py
openerp/addons/base/res/res_partner.py