[FW][IMP] academic_sale_subscription: add setting for subscription invoices

[fw-bot-adhoc]

Forward-Port-Of: #242

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@lef-adhoc @lav-adhoc cherrypicking of pull request #242 failed.

stdout:

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

stderr:

20:46:45.332404 git.c:444               trace: built-in: git cherry-pick f6f6e9432efffb8262ea5a5608d0cd93dde07a61
error: could not apply f6f6e94... [IMP] academic_sale_subscription: add setting for subscription invoices
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