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] point_of_sale: ensure correct display of custom attributes #159732

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 28, 2024

Before this commit, the custom attribute names were not correctly displayed when added to an order.

opw-3795843


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #158805

@robodoo
Copy link
Contributor

robodoo commented Mar 28, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 28, 2024

@pedrambiria @caburj cherrypicking of pull request #158805 failed.

stdout:

Auto-merging addons/point_of_sale/static/src/app/store/models.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/store/models.js

stderr:

17:06:13.810080 git.c:463               trace: built-in: git cherry-pick 1709d6da03e75abbf85d7c3e34399e3649277938
error: could not apply 1709d6da03e7... [FIX] point_of_sale: ensure correct display of custom attributes
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
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.

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

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 28, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 28, 2024
@pedrambiria pedrambiria force-pushed the saas-17.1-17.0-pos-opw-3795843-pebr-l0jt-fw branch from 829612f to e7afccc Compare March 29, 2024 14:07
Before this commit, the custom attribute names were not correctly
displayed when added to an order.

opw-3795843

X-original-commit: c6b1d28
@pedrambiria pedrambiria force-pushed the saas-17.1-17.0-pos-opw-3795843-pebr-l0jt-fw branch from e7afccc to 9102607 Compare March 29, 2024 14:07
@C3POdoo C3POdoo requested review from a team and adgu-odoo and removed request for a team March 29, 2024 14:10
@pedrambiria
Copy link
Contributor

robodoo r+

robodoo pushed a commit that referenced this pull request Mar 29, 2024
Before this commit, the custom attribute names were not correctly
displayed when added to an order.

opw-3795843

closes #159732

X-original-commit: c6b1d28
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
@robodoo robodoo closed this Mar 29, 2024
@fw-bot fw-bot deleted the saas-17.1-17.0-pos-opw-3795843-pebr-l0jt-fw branch April 12, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants