Skip to content

Conversation

jjmaksoud
Copy link
Contributor

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

@robodoo
Copy link
Contributor

robodoo commented Aug 27, 2025

Pull request status dashboard

@jjmaksoud jjmaksoud force-pushed the master-manual-fields-maji branch 2 times, most recently from 6bb5355 to 5efae69 Compare August 27, 2025 16:26
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"):
Copy link
Contributor

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.

Copy link
Contributor Author

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

Copy link
Contributor

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

Copy link
Contributor Author

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

Copy link
Contributor

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.

return parse_version(a) <= parse_version(release.serie) <= parse_version(b)

@KangOl
Copy link
Contributor

KangOl commented Aug 28, 2025

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
@jjmaksoud jjmaksoud force-pushed the master-manual-fields-maji branch from 5efae69 to 6271e8d Compare August 29, 2025 08:41
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.

4 participants