[FW][REF] academic: add current year filter to student group validation

[fw-bot-adhoc]

Forward-Port-Of: #254

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

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

stdout:

Auto-merging academic/models/res_partner.py
CONFLICT (content): Merge conflict in academic/models/res_partner.py

stderr:

14:25:45.558451 git.c:444               trace: built-in: git cherry-pick 46c842768c13daaf6fdc978a2b2446ae5a790802
error: could not apply 46c8427... [REF] academic: add current year filter to student group validation
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]

Ya esta mezcaldo en otro pr