Skip to content

Comments

[IMP]purchase_ux: improve purchase bill line match view#302

Open
fw-bot-adhoc wants to merge 1 commit intoingadhoc:19.0from
adhoc-dev:19.0-18.0-t-55401-mav-3909-fw
Open

[IMP]purchase_ux: improve purchase bill line match view#302
fw-bot-adhoc wants to merge 1 commit intoingadhoc:19.0from
adhoc-dev:19.0-18.0-t-55401-mav-3909-fw

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #300

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Author

@mav-adhoc @jcadhoc cherrypicking of pull request #300 failed.

stdout:

Auto-merging purchase_ux/__manifest__.py
CONFLICT (content): Merge conflict in purchase_ux/__manifest__.py
Auto-merging purchase_ux/i18n/es.po
Auto-merging purchase_ux/models/__init__.py
CONFLICT (content): Merge conflict in purchase_ux/models/__init__.py
Auto-merging purchase_ux/models/account_move.py
Auto-merging purchase_ux/models/purchase_order.py

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.

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

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

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