[17.0][OU-FIX] maintenance: keep maintenance_plan and maintenance_plan_activity#5
Open
eantones wants to merge 1 commit into
Open
[17.0][OU-FIX] maintenance: keep maintenance_plan and maintenance_plan_activity#5eantones wants to merge 1 commit into
eantones wants to merge 1 commit into
Conversation
…vity The 17.0 apriori merges maintenance_plan and maintenance_plan_activity into core maintenance, following the deprecation announced in OCA/maintenance#414 / OCA#468 (Feb 2025). That deprecation was later reverted: both modules were ported again and are alive and maintained on the 18.0 branch (Nov 2025 onwards, still updated mid 2026). Merging them on the 16->17 hop would destroy a live, heavily used feature set for databases that keep using the modules, and the 18.0 apriori has no entry to handle them afterwards. - apriori: drop the maintenance_plan / maintenance_plan_activity merge entries. base_maintenance_config and maintenance_plan_employee stay: those were never ported to 17.0/18.0, their merge is still right. - maintenance 17.0.1.0 scripts: drop the _maintenance_plan() helpers (note -> instruction_text rename and plan -> core recurrence conversion). They assume the merge happened; with the modules kept installed they would fight the modules' own schema and duplicate the recurrence logic. maintenance_plan rides the hop normally (it is ported to 17.0). maintenance_plan_activity has no 17.0 port: it is carried installed without code through 17 and updates again on the 17->18 hop.
eantones
added
the
fork-only
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The 17.0 apriori merges
maintenance_planandmaintenance_plan_activityinto coremaintenance, following the deprecation announced in OCA/maintenance#414 (see OCA/maintenance#414 (comment)) and OCA/maintenance#468, introduced by OCA#4654 (Feb 2025).That deprecation was later reverted: both modules were ported again and are alive and maintained on the OCA/maintenance 18.0 branch (Nov 2025 onwards, still receiving updates mid 2026).
Merging them on the 16→17 hop would destroy a live, heavily used feature set for databases that keep using the modules, and the 18.0 apriori has no entry to handle them afterwards (they would be left orphaned).
Changes
apriori.py: drop themaintenance_plan/maintenance_plan_activitymerge entries.base_maintenance_configandmaintenance_plan_employeestay — those were never ported to 17.0/18.0, their merge is still right.maintenance17.0.1.0 scripts: drop the_maintenance_plan()helpers (note→instruction_textrename and plan → core recurrence conversion). They assume the merge happened; with the modules kept installed they would fight the modules' own schema and duplicate the recurrence logic.Behaviour after this change
maintenance_planrides the hop normally (it is ported to 17.0).maintenance_plan_activityhas no 17.0 port: it is carried installed without code through 17 and updates again on the 17→18 hop.