-
Notifications
You must be signed in to change notification settings - Fork 72
[FIX] orm: patch manual field names #309
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
base: master
Are you sure you want to change the base?
Conversation
6bb5355
to
5efae69
Compare
src/util/orm.py
Outdated
# 3.5.3 allow loading manual fields | ||
# 3.5.3 allow loading manual fields | ||
|
||
if version_between("saas~16.4", "saas~18.4"): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This includes 18.4, I'd suggest you invert the checks
if version >= 18.4:
...
elif version >= 16.4:
...
Note that there are some errors in the CI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ci errors are expected as I did not bundle the branches for runbot, and matt is running upgrades to master where the fw is not created
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, we will need some dance to merge the PRs in the right order.
cc: @KangOl
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
community should be deployed first, even if we dont merge a util fix for a while the outcome will be as it is now. But if we merge a patch before the community deployment we will get the error that is currently in the ci
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not forget to put the check for the versions in the right order.
Line 123 in 5efae69
return parse_version(a) <= parse_version(release.serie) <= parse_version(b) |
upgradeci retry with always only hr |
The check for manual field names moved from being a model method to a util function. It needs to be patched starting version saas~18.4 to allow loading custom module fields as manual for tests during the upgrade process. odoo/odoo#224524 odoo/enterprise#93335
5efae69
to
6271e8d
Compare
The check for manual field names moved from being a model method to a util function. It needs to be patched starting version
saas~18.4
to allow loading custom module fields as manual for tests during the upgrade process.Should be merged only after odoo/odoo#224524 and https://github.com/odoo/enterprise/pull/93335