[FW][IMP] academic: show total amount due in portal of parents

[fw-bot-adhoc]

Forward-Port-Of: #235

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@lef-adhoc @rov-adhoc cherrypicking of pull request #235 failed.

stdout:

Auto-merging academic/i18n/es.po
CONFLICT (content): Merge conflict in academic/i18n/es.po
Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

16:23:54.580483 git.c:444               trace: built-in: git cherry-pick d198c45af6bb2c690a2b8abd35fa0b104b3ae1cc
error: could not apply d198c45... [IMP] academic: show total amount due in portal of parents
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+