Merge remote-tracking branch 'odoo/14.0' into 14.0

Author: OCA-git-bot

addons/website/models/website.py

@@ -13,6 +13,7 @@
 from werkzeug.exceptions import NotFound
 
 from odoo import api, fields, models, tools, http
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 from odoo.addons.http_routing.models.ir_http import slugify, _guess_mimetype, url_for
 from odoo.addons.website.models.ir_http import sitemap_qs2dom
 from odoo.addons.portal.controllers.portal import pager
@@ -238,9 +239,11 @@ def _handle_favicon(self, vals):
             vals['favicon'] = tools.image_process(vals['favicon'], size=(256, 256), crop='center', output_format='ICO')
 
     def unlink(self):
-        website = self.search([('id', 'not in', self.ids)], limit=1)
-        if not website:
-            raise UserError(_('You must keep at least one website.'))
+        if not self.env.context.get(MODULE_UNINSTALL_FLAG, False):
+            website = self.search([('id', 'not in', self.ids)], limit=1)
+            if not website:
+                raise UserError(_('You must keep at least one website.'))
+
         # Do not delete invoices, delete what's strictly necessary
         attachments_to_unlink = self.env['ir.attachment'].search([
             ('website_id', 'in', self.ids),

doc/cla/corporate/mainframemonkey.md

@@ -15,3 +15,5 @@ List of contributors:
 Yenthe Van Ginneken [email protected] https://github.com/Yenthe666
 
 Ward Marissen [email protected] https://github.com/wardm95
+
+Swapnesh Shah [email protected] https://github.com/sswapnesh