Skip to content

[FW][IMP] academic: enhance invoice portal template to display total amou… #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

…nt due with currency

Forward-Port-Of: #258

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

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

stderr:

15:29:19.483011 git.c:444               trace: built-in: git cherry-pick 959e029d56765805ed072dceaaae93c3a8ba2eb1
error: could not apply 959e029... [IMP] academic: enhance invoice portal template to display total amount due with currency
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 lef-adhoc force-pushed the 18.0-17.0-t-51612-lef-9yKR-fw branch from 9e21ab3 to da23f0b Compare May 8, 2025 19:39
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

roboadhoc pushed a commit that referenced this pull request May 8, 2025
…nt due with currency

closes #263

X-original-commit: dd1a7eb
Signed-off-by: matiasperalta1 <mnp@adhoc.com.ar>
Signed-off-by: Franco Leyes <lef@adhoc.com.ar>
@roboadhoc roboadhoc closed this in 0ed6cb8 May 8, 2025
@roboadhoc roboadhoc added the 17.1 label May 8, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-51612-lef-9yKR-fw branch May 8, 2025 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants