Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] mail_activity_type rename in merge_models method #316

Merged
merged 1 commit into from
Jan 31, 2023

Conversation

ernestotejeda
Copy link
Member

@ernestotejeda ernestotejeda commented Jan 31, 2023

Cc @Tecnativa TT41247

From Odoo version 15.0, in mail.activity.type model, the field that stores a reference to res.model is res_model and not res_model_id field as in previous versions, so we need to take this into account in the merge_models method when updating mail.activity.type.
Odoo 14.0: https://github.com/odoo/odoo/blob/fe87755a4499f68de4625fd9940f25960896bc55/addons/mail/models/mail_activity.py#L58
odoo 15.0: https://github.com/odoo/odoo/blob/5553ad50bf54bef986038f94e8c8462e2547a927/addons/mail/models/mail_activity_type.py#L46

@ernestotejeda ernestotejeda force-pushed the fix-merge_models-method branch 2 times, most recently from a584415 to 03d884f Compare January 31, 2023 13:47
@ernestotejeda
Copy link
Member Author

ping @pedrobaeza

@pedrobaeza
Copy link
Member

Please explain here and in the commit message why this, pointing to the model line where it's seen the change on the model data.

From Odoo version 15.0, in `mail.activity.type` model, the field that
stores a reference to `res.model` is `res_model` and not `res_model_id`
field as in previous versions, so we need to take this into account in
the merge_models method when updating mail.activity.type.
Odoo 14.0: https://github.com/odoo/odoo/blob/fe87755a4499f68de4625fd9940f25960896bc55/addons/mail/models/mail_activity.py#L58
odoo 15.0: https://github.com/odoo/odoo/blob/5553ad50bf54bef986038f94e8c8462e2547a927/addons/mail/models/mail_activity_type.py#L46
@ernestotejeda ernestotejeda force-pushed the fix-merge_models-method branch from 03d884f to 006cd46 Compare January 31, 2023 16:30
@ernestotejeda
Copy link
Member Author

@pedrobaeza done. I put the explanation in the Pull Request description and in the commit message

@pedrobaeza pedrobaeza merged commit 288666d into OCA:master Jan 31, 2023
@pedrobaeza pedrobaeza deleted the fix-merge_models-method branch January 31, 2023 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants