[FW][FIX] academic: change in view reference

[fw-bot-adhoc]

Forward-Port-Of: #237

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

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

stdout:

Auto-merging academic/views/res_partner_views.xml
Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

11:18:18.719087 git.c:444               trace: built-in: git cherry-pick 538cac48fa0d48f1bc19406694a8ed399e371a07
error: could not apply 538cac4... [FIX] academic: change in view reference
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

[jjscarafia]

los errores de runbot eran por otros cambios