Apply changes of various PRs #4

tarteo wants to merge 1020 commits into

acsone:18.0-mig-subscription_ocaacsone/contract:18.0-mig-subscription_ocafrom

tarteo:18.0-mig-subscription_ocatarteo/contract:18.0-mig-subscription_ocaCopy head branch name to clipboard