[MERGE] forward port branch 9.0 up to eaddb7caff

2017-03-06 13:09:17 +01:00
parent be0c9596c8 eaddb7caff
commit 503227838d
1 changed files with 2 additions and 4 deletions
@@ -113,10 +113,8 @@ class IrModel(models.Model):
            for model in self:
                if model.state != 'manual':
                    raise UserError(_("Model '%s' contains module data and cannot be removed!") % model.name)
-
-        # prevent screwing up fields that depend on these models' fields
-        for model in self:
-            model.field_id._prepare_update()
+                # prevent screwing up fields that depend on these models' fields
+                model.field_id._prepare_update()

        self._drop_table()
        res = super(IrModel, self).unlink()