Skip to content
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

[FW][FIX] l10n_ar_ux: Recompute the commercial partner for edit de contact form in portal #931

Open
wants to merge 1 commit into
base: 17.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticekt: 73707

Forward-Port-Of: #850

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@mem-adhoc @zaoral cherrypicking of pull request #850 failed.

stdout:

Auto-merging l10n_ar_ux/controllers/portal.py
CONFLICT (content): Merge conflict in l10n_ar_ux/controllers/portal.py
Auto-merging l10n_ar_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_ux/__manifest__.py

stderr:

19:32:16.622391 git.c:444               trace: built-in: git cherry-pick 45786102be1ae674f5802427ae5f160028a275ac
error: could not apply 45786102... [FIX] l10n_ar_ux: Recompute the commercial partner for edit de contact form in portal
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

@mem-adhoc mem-adhoc force-pushed the 17.0-16.0-t-73707-mem--MqG-fw branch 4 times, most recently from af45d7e to 52cd759 Compare October 22, 2024 15:17
@mem-adhoc
Copy link
Contributor

@roboadhoc r+ override=ci/runbot-oba

@roboadhoc
Copy link

@mem-adhoc you may want to rebuild or fix this PR as it has failed CI.

@roboadhoc
Copy link

I'm sorry, @mem-adhoc: you are not allowed to override this status.

…t form in portal

Ticekt: 73707
X-original-commit: 9065fa8
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