[FW][IMP] academic: add company in same partner dni

[fw-bot-adhoc]

Forward-Port-Of: #231

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

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

stdout:

Auto-merging academic/views/res_partner_views.xml
Auto-merging academic/models/res_partner.py
CONFLICT (content): Merge conflict in academic/models/res_partner.py
Auto-merging academic/i18n/es_UY.po
CONFLICT (content): Merge conflict in academic/i18n/es_UY.po
Auto-merging academic/i18n/es.po
Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

13:44:15.665324 git.c:444               trace: built-in: git cherry-pick bb23121395b997b718abd26c8591dbb8dd870d81
error: could not apply bb23121... [IMP] academic: add company in same partner dni
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