Migration to version 18.0

[OCA-git-bot]

Todo

https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-18.0

Modules to migrate

• [x] contract - By @sbejaoui - #1136
• [x] contract_forecast - By @sbejaoui - #1225
• [ ] contract_invoice_auto_validate - By @sbejaoui - #1226
• [ ] contract_invoice_start_end_dates - By @marielejeune - #1247
• [ ] contract_mandate - By @sbejaoui - #1228
• [ ] contract_payment_mode - By @AndreuOForgeFlow - #1212
• [ ] contract_price_revision - By @AlvRM2002 - #1184
• [ ] contract_queue_job - By @sbejaoui - #1227
• [ ] contract_sale - By @sbejaoui - #1138
• [ ] contract_sale_generation - By @javierjcf - #1252
• [ ] contract_sale_invoicing - By @tobiaszehntner - #1206
• [ ] contract_sale_mandate - By @samirGuesmi - #1246
• [ ] contract_sale_payment_mode - By @bjouini-acsone - #1233
• [ ] contract_sale_transmit_method - By @sbejaoui - #1238
• [ ] contract_transmit_method - By @sbejaoui - #1236
• [ ] contract_variable_qty_prorated - By @sbejaoui - #1140
• [ ] contract_variable_qty_timesheet - By @tobiaszehntner - #1207
• [x] contract_variable_quantity - By @sbejaoui - #1139
• [x] product_contract - By @sbejaoui - #1137
• [ ] product_contract_variable_quantity - By @sbejaoui - #1145
• [ ] subscription_oca - By @tobiaszehntner - #1209

Missing module? Check https://github.com/OCA/maintainer-tools/wiki/%5BFAQ%5D-Missing-modules-in-migration-issue-list

[tobiaszehntner]

Will migrate contract_sale_invoicing

[tobiaszehntner]

Will migrate contract_variable_qty_timesheet

[tobiaszehntner]

Will migrate subscription_oca

[tobiaszehntner]

Will migrate subscription_oca

We had to abandon our PR (https://github.com/OCA/contract/pull/1209) although it's pretty close to the finish line. Requires some porting from v16 which needs only couple fixes (https://github.com/acsone/contract/pull/4). If someone wants to take it from here, please do!

[tarteo]

Will migrate subscription_oca

We had to abandon our PR (#1209) although it's pretty close to the finish line. Requires some porting from v16 which needs only couple fixes (acsone#4). If someone wants to take it from here, please do!

I'll take it over

[javierjcf]

Hello,

I have a question about the migration process.

The module contract_sale_generation exists in the 16.0 branch, and I have already submitted PR #1234 to migrate it to 17.0, but it has not been merged yet.

Now, I want to propose a new PR for the 18.0 migration. I'm unsure of the correct git workflow:

Should I cherry-pick the commits from the 16.0 branch, ignoring my pending 17.0 PR? Or should I base my new 18.0 branch on my 17.0 PR's branch, so that the history for 18.0 includes the commits from the 17.0 migration?

My concern is that if I base the new PR on my pending 17.0 PR, there could be a problem with the commits if the 17.0 PR isn't approved. On the other hand, if I migrate directly from 16.0, there would be an issue if the 17.0 PR is approved first (as the 18.0 PR would be missing those commits), and the commit history wouldn't be properly traced if it's approved later.

What is the standard procedure in this situation?

[pedrobaeza]

You can use your 17.0 migration branch as source for the git am process, changing remote and branch name.

[javierjcf]

Thanks @pedrobaeza

So will migrate contract_sale_generation #1252

[chrisandrewmann]

Could someone please update subscription_oca status as this has just been merged here: https://github.com/OCA/contract/pull/1304