[MERGE] forward port of branch 7.0 up to a86dfb8

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account/report/account_invoice_report_view.xml
Simple merge

diff --cc addons/account/wizard/account_fiscalyear_close.py
Simple merge

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/account_voucher/wizard/account_statement_from_invoice.py
Simple merge

diff --cc addons/mail/static/src/xml/mail.xml
index 5d3175b,1e52105..92023b7
--- 1/addons/mail/static/src/xml/mail.xml
--- 2/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@@ -50,11 -50,10 +50,12 @@@
              <t t-if="!widget.options.view_mailbox">
                  <div class="field_text oe_compact oe_compact_record">
                      <a class="oe_compose_post" t-if="widget.options.compose_placeholder"><t t-raw="widget.options.compose_placeholder"/></a>
-                     <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
+                     <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox"
+                         title="Send a message to all followers of the document">Send a message</a>
 -                    <span class="oe_grey oe_sep_word">or</span>
 -                    <a class="oe_compose_log" title="Log a note for this document. No notification will be sent">Log a note</a>
 +                    <t t-if="widget.options.display_log_button">
 +                       <span class="oe_grey oe_sep_word">or</span>
-                        <a class="oe_compose_log">Log an internal note</a>
++                       <a class="oe_compose_log" title="Log a note for this document. No notification will be sent">Log an internal note</a>
 +                    </t>
                  </div>
              </t>
          </div>

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc openerp/report/report_sxw.py
Simple merge