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] account_cashbox: add cashbox_id to unique session constraint #482

Merged
merged 2 commits into from Apr 25, 2024

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #481

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@cav-adhoc @jjscarafia cherrypicking of pull request #481 failed.

stdout:

Auto-merging account_cashbox/models/account_cashbox_session.py
Auto-merging account_cashbox/__manifest__.py
CONFLICT (content): Merge conflict in account_cashbox/__manifest__.py

stderr:

14:06:59.114509 git.c:444               trace: built-in: git cherry-pick 461f364f2d94e0dbac1da9f8ebd0845b054f5d83
error: could not apply 461f364f... [FIX] account_cashbox: add cashbox_id to unique session constraint
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

@jjscarafia jjscarafia merged commit 482f0f7 into ingadhoc:17.0 Apr 25, 2024
@jjscarafia jjscarafia deleted the 17.0-16.0-t-37696-1-cav-bgQa-fw branch April 25, 2024 14:08
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.

None yet

4 participants