[FW][FIX] academic_sale_subscription: payment methods in parent portal

[fw-bot-adhoc]

Forward-Port-Of: #250

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@lef-adhoc @matiasperalta1 cherrypicking of pull request #250 failed.

stdout:

Auto-merging academic_sale_subscription/__manifest__.py
CONFLICT (content): Merge conflict in academic_sale_subscription/__manifest__.py

stderr:

18:17:40.317655 git.c:444               trace: built-in: git cherry-pick fa39b97c8f235488f6d05e5039ed52dec681ef95
error: could not apply fa39b97... [FIX] academic_sale_subscription: payment methods in parent portal
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[lef-adhoc]

@roboadhoc r+