[15.0][MIG] fieldservice_portal: Migration to 15.0 #1289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ppyczko
force-pushed
the
15.0-mig-fieldservice_portal
branch
9 times, most recently
from
a770f0c to
12899b1
Compare
peluko00
approved these changes
Dec 12, 2024
|
Hi @max3903, sorry to ping you directly. Could you review if this is ready to merge when you have a moment please? Thank you! |
ppyczko
force-pushed
the
15.0-mig-fieldservice_portal
branch
from
12899b1 to
add39c6
Compare
|
/ocabot merge nobump |
|
This PR looks fantastic, let's merge it! |
|
Congratulations, your PR was merged at d832a09. Thanks a lot for contributing to OCA. ❤️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Module migrated to version 15.0. The migration commit has been backported from the 16.0 migration.
cc https://github.com/APSL 164778
@miquelalzanillas @lbarry-apsl @mpascuall @peluko00 @javierobcn @BernatObrador please review
Additionally, the [FIX] addresses an error encountered during pipeline execution (see attached image).
I modified the 'order' variable to 'fsm_order' to resolve errors that occur when the module is installed alongside the Purchase module. In the v16 and v17 field-service repositories, the fieldservice_purchase module isn't available, so the Purchase module isn't being installed automatically and doesn't create conflicts. However, in field-service v15, the fieldservice_purchase module exists. Due to changes introduced between v14 and v15 in the 'portal_templates.xml' file of the Purchase module, the code incorrectly interprets 'order' as an FSM order instead of a purchase order, leading to conflicts.
This change has been included in a separate commit to allow for easier forwarding to newer versions if required.