[FW][IMP] academic: include sequence in student link mapping for invoice …

[fw-bot-adhoc]

…computation

Forward-Port-Of: #277

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

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

stdout:

CONFLICT (modify/delete): academic/models/sale_order.py deleted in HEAD and modified in a13006f ([IMP] academic: include sequence in student link mapping for invoice computation). Version a13006f ([IMP] academic: include sequence in student link mapping for invoice computation) of academic/models/sale_order.py left in tree.
Auto-merging academic/models/res_partner.py
CONFLICT (content): Merge conflict in academic/models/res_partner.py

stderr:

18:45:24.012070 git.c:444               trace: built-in: git cherry-pick a13006fe55b4faef902d188fc9ecc95a50820105
error: could not apply a13006f... [IMP] academic: include sequence in student link mapping for invoice computation
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