[FIX] util.remove_inherit_from_model: ignore mixins m2m

In mixins, the one2many are actually targeted by the res_model/res_id
couple (i.e. `mail_message` on `mail.thread`). We should then ignore the
indirect references without a `res_id` column.

Stored m2m should be handled by the caller. We needs to actually remove
the m2m table (should be unique per model) and as we don't know the table
name (info not reflected in the database), we can't delete it ourself.

This issue has been found during the `17.0` upgrade of
`base_automation`, which removes the `ir.actions.server` inherit[^1].
As the `ir.actions.server` contains a m2m on `ir.model.fields`
(`webhook_field_ids`), without the `res_id` filter, all the the
`base.automation` fields entries where removed (including the custom
fields ones).

[^1]: odoo/odoo#114352

closes #86

Signed-off-by: Christophe Simonis (chs) <[email protected]>

Author: KangOl

src/util/models.py

@@ -512,12 +512,10 @@ def remove_inherit_from_model(cr, model, inherit, keep=(), skip_inherit=()):
         [tuple(inherit_models), list(keep)],
     )
     for field, ftype, relation, store in cr.fetchall():
-        if ftype.endswith("2many") and store:
-            # for mixin, x2many are filtered by their model.
-            # for "classic" inheritance, the caller is responsible to drop the underlying m2m table
-            # (or keeping the field)
+        if ftype == "one2many" and store:
+            # for mixin, one2many are filtered by their model and res_id.
             table = table_of_model(cr, relation)
-            irs = [ir for ir in indirect_references(cr) if ir.table == table]
+            irs = [ir for ir in indirect_references(cr) if ir.table == table and ir.res_id is not None]
             for ir in irs:
                 query = 'DELETE FROM "{}" WHERE ({})'.format(ir.table, ir.model_filter())
                 cr.execute(query, [model])  # cannot be executed in parallel. See git blame.