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_sale: Sale sequence #226

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

Conversation

fw-bot-adhoc
Copy link
Contributor

Depending on both sale checkbook and sale order type

Ticket 85984 and 86018

Forward-Port-Of: #224

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@zaoral @pablohmontenegro cherrypicking of pull request #224 failed.

stdout:

Auto-merging l10n_ar_sale/models/sale_order.py
CONFLICT (content): Merge conflict in l10n_ar_sale/models/sale_order.py

stderr:

15:44:15.849911 git.c:444               trace: built-in: git cherry-pick 136bfb8fb13bb5e324f34be5fd4f6b9bbda8fd28
error: could not apply 136bfb8... [FIX] l10n_ar_sale: Sale sequence
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

Depending on both sale checkbook and sale order type

Ticket 85984 and 86018

X-original-commit: d8c7a4d
@zaoral zaoral force-pushed the 17.0-16.0-h-85984-kz-uWTU-fw branch from c454b8e to 6d6974f Compare January 17, 2025 20:31
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