diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-12 16:49:11 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-12 16:49:11 +0200 |
| commit | af1853775fe9b95e5b0f927c0894abab1be683d7 (patch) | |
| tree | d2ed115233bd4f74fa0ac6a550c5241fb98f8f9b /addons/website/models/ir_model.py | |
| parent | 9a6ef3c99c775901f70e3704f7c94d3db38c1fa6 (diff) | |
| parent | e3658d6f56801d7037f11d4c61bb89c037a1bc98 (diff) | |
[MERGE] forward port branch 11.0 up to e3658d6f568
Diffstat (limited to 'addons/website/models/ir_model.py')
| -rw-r--r-- | addons/website/models/ir_model.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/models/ir_model.py b/addons/website/models/ir_model.py index 6d254374c38..84c6a0b1836 100644 --- a/addons/website/models/ir_model.py +++ b/addons/website/models/ir_model.py @@ -10,6 +10,6 @@ class IrModel(models.Model): @api.multi def unlink(self): - self.env.cr.execute( - "DELETE FROM ir_model_fields WHERE name='website_id'") + self.env.cr.execute("DELETE FROM ir_model_fields WHERE name='website_id'") + self.env.cr.execute("DELETE FROM res_config_settings WHERE website_id IS NOT NULL") return super(IrModel, self).unlink() |