[MERGE] forward port of branch 8.0 up to fd4fd35

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

diff --cc addons/account_anglo_saxon/test/anglo_saxon.yml
Simple merge

diff --cc addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
Simple merge

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

diff --cc addons/fleet/fleet_view.xml
Simple merge

diff --cc addons/mail/res_config.py
index e238d9a,bac956a..6aed3de
--- 1/addons/mail/res_config.py
--- 2/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@@ -30,18 -28,11 +30,18 @@@ class project_configuration(osv.Transie
      _inherit = 'base.config.settings'
  
      _columns = {
 +        'fail_counter': fields.integer('Fail Mail', readonly=True),
          'alias_domain': fields.char('Alias Domain',
                                       help="If you have setup a catch-all email domain redirected to "
-                                           "the OpenERP server, enter the domain name here."),
+                                           "the Odoo server, enter the domain name here."),
      }
  
 +    def get_default_fail_counter(self, cr, uid, ids, context=None):
 +        previous_date = datetime.datetime.now() - datetime.timedelta(days=30)
 +        return {
 +            'fail_counter': self.pool.get('mail.mail').search(cr, uid, [('date', '>=', previous_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)), ('state', '=', 'exception')], count=True, context=context),
 +        }
 +
      def get_default_alias_domain(self, cr, uid, ids, context=None):
          alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", default=None, context=context)
          if alias_domain is None:

diff --cc addons/mail/res_config_view.xml
Simple merge

diff --cc addons/mail/tests/test_mail_features.py
Simple merge

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

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/stock/doc/stock.rst
Simple merge

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

diff --cc addons/website/controllers/main.py
Simple merge

diff --cc addons/website/views/website_templates.xml
Simple merge

diff --cc addons/website_blog/static/src/js/website_blog.inline.discussion.js
Simple merge

diff --cc addons/website_forum/models/forum.py
Simple merge

diff --cc openerp/addons/base/ir/ir_qweb.py
Simple merge

diff --cc openerp/addons/base/res/res_partner_view.xml
Simple merge

diff --cc openerp/release.py
Simple merge