[MERGE] forward port of branch 7.0 up to 3509e15c

addons/account/account_invoice.py

addons/auth_ldap/users_ldap.py

addons/base_gengo/res_company.py

addons/board/static/src/js/dashboard.js

addons/email_template/security/ir.model.access.csv

addons/email_template/wizard/mail_compose_message.py

addons/email_template/wizard/mail_compose_message_view.xml

addons/fetchmail/fetchmail.py

addons/hr_holidays/hr_holidays.py

addons/hr_holidays/security/ir_rule.xml

addons/mail/mail_alias.py

addons/mail/static/src/js/announcement.js

addons/pad/pad.py

addons/pad/res_company.py

addons/point_of_sale/point_of_sale.py

addons/product_visible_discount/product_visible_discount.py

addons/resource/security/ir.model.access.csv

addons/sale_margin/sale_margin.py

addons/web/static/src/js/chrome.js

openerp/addons/base/ir/ir_attachment.py