diff --git a/addons/auth_ldap/models/res_company_ldap.py b/addons/auth_ldap/models/res_company_ldap.py
index 05dcb275afa..effea64a67b 100644
--- a/addons/auth_ldap/models/res_company_ldap.py
+++ b/addons/auth_ldap/models/res_company_ldap.py
@@ -193,7 +193,7 @@ class CompanyLDAP(models.Model):
         elif conf['create_user']:
             _logger.debug("Creating new Odoo user \"%s\" from LDAP" % login)
             values = self.map_ldap_attributes(conf, login, ldap_entry)
-            SudoUser = self.env['res.users'].sudo()
+            SudoUser = self.env['res.users'].sudo().with_context(no_reset_password=True)
             if conf['user']:
                 values['active'] = True
                 user_id = SudoUser.browse(conf['user'][0]).copy(default=values).id
diff --git a/addons/base_vat/models/res_partner.py b/addons/base_vat/models/res_partner.py
index 69d7204bf9a..4f16ecbfcb9 100644
--- a/addons/base_vat/models/res_partner.py
+++ b/addons/base_vat/models/res_partner.py
@@ -356,3 +356,10 @@ class ResPartner(models.Model):
             return int(vat[9]) == c1 and int(vat[10]) == c2
 
         return False
+
+    def check_vat_al(self, vat):
+        try:
+            import stdnum.al
+            return stdnum.al.vat.is_valid(vat)
+        except ImportError:
+            return True
diff --git a/addons/l10n_be/data/account_pcmn_belgium_data.xml b/addons/l10n_be/data/account_pcmn_belgium_data.xml
index b8730176185..268e18de317 100644
--- a/addons/l10n_be/data/account_pcmn_belgium_data.xml
+++ b/addons/l10n_be/data/account_pcmn_belgium_data.xml
@@ -558,6 +558,7 @@
         <record id="a4512" model="account.account.template">
             <field name="name">Compte courant administration T.V.A.</field>
             <field name="code">4512</field>
+            <field name="reconcile" eval="True"/>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
         </record>
diff --git a/addons/mail/wizard/email_template_preview.py b/addons/mail/wizard/email_template_preview.py
index 678dbfa3ee5..a05badd0359 100644
--- a/addons/mail/wizard/email_template_preview.py
+++ b/addons/mail/wizard/email_template_preview.py
@@ -34,6 +34,7 @@ class TemplatePreview(models.TransientModel):
 
     res_id = fields.Selection(_get_records, 'Sample Document')
     partner_ids = fields.Many2many('res.partner', string='Recipients')
+    attachment_ids = fields.Many2many(string='Attachments', store=False)
 
     @api.onchange('res_id')
     @api.multi
diff --git a/addons/website_forum_doc/models/forum_documentation_toc.py b/addons/website_forum_doc/models/forum_documentation_toc.py
index fc167f1ed80..bb6a04aa670 100644
--- a/addons/website_forum_doc/models/forum_documentation_toc.py
+++ b/addons/website_forum_doc/models/forum_documentation_toc.py
@@ -8,7 +8,7 @@ class Documentation(models.Model):
     _name = 'forum.documentation.toc'
     _description = 'Documentation ToC'
     _inherit = ['website.seo.metadata']
-    _order = "parent_left"
+    _order = "sequence, name"
     _parent_order = "sequence, name"
     _parent_store = True
 
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 1784f30b949..2b37b49d016 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -103,7 +103,7 @@ class WebsiteMembership(http.Controller):
 
         # get google maps localization of partners
         google_map_partner_ids = []
-        if request.env.ref('website_membership.opt_index_google_map').customize_show:
+        if request.env.ref('website_membership.opt_index_google_map').active:
             google_map_partner_ids = MembershipLine.search(line_domain).get_published_companies(limit=2000)
 
         search_domain = [('membership_state', '=', 'free'), ('website_published', '=', True)]
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index f778124aa85..d61845ee334 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -119,7 +119,7 @@ class WebsiteAccount(website_account):
             step=self._items_per_page
         )
         # content according to pager and archive selected
-        tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
+        tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=(page - 1) * self._items_per_page)
         request.session['my_tasks_history'] = tasks.ids[:100]
 
         values.update({
diff --git a/odoo/fields.py b/odoo/fields.py
index 9b0a5fea8af..a659165fe29 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -2422,6 +2422,8 @@ class Many2many(_RelationalMulti):
                     self.column2 = '%s_id' % comodel._table
             # check validity of table name
             check_pg_name(self.relation)
+        else:
+            self.relation = self.column1 = self.column2 = None
 
     def _setup_regular_full(self, model):
         super(Many2many, self)._setup_regular_full(model)