Skip to content

[FIX] Fix cups constraint - #435

Closed
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:19.0from
adhoc-dev:19.0-18.0-t-72233-maq-7914-fw
Closed

[FIX] Fix cups constraint#435
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:19.0from
adhoc-dev:19.0-18.0-t-72233-maq-7914-fw

Conversation

@fw-bot-adhoc

Copy link
Copy Markdown
Contributor

Forward-Port-Of: #434

@roboadhoc

Copy link
Copy Markdown
Contributor

Pull request status dashboard

@fw-bot-adhoc

Copy link
Copy Markdown
Contributor Author

@maq-adhoc @jcadhoc cherrypicking of pull request #434 failed.

stdout:

CONFLICT (modify/delete): base_report_to_print_node/models/printing_printer.py deleted in 93f8cd6fd0889f7b88c2fd87337a0b8642c5a467 and modified in 3a5eb4f70c6853add8231a4ab93ca94c19fd6611.  Version 3a5eb4f70c6853add8231a4ab93ca94c19fd6611 of base_report_to_print_node/models/printing_printer.py left in tree.

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @roboadhoc.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot-adhoc

Copy link
Copy Markdown
Contributor Author

@maq-adhoc @jcadhoc this forward port of #434 is awaiting action (not merged or closed).

@cav-adhoc cav-adhoc closed this Aug 26, 2026
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.

4 participants