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: load product requests #158193

Open
wants to merge 1 commit into
base: saas-17.2
Choose a base branch
from

Conversation

fw-bot
Copy link
Contributor

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

When the pos was loading only a part of the products, the request should follow those rules order:

  • product is a favorite
  • product is a service
  • product had stock moves soon
  • product update

But this request didn't take into account consumables products and if there was no stock move, the value was null and postgres consider null values first when ordering desc. Now with that changes, the order is correctly set based on the rules above.


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

Forward-Port-Of: #129227
Forward-Port-Of: #124223

When the pos was loading only a part of the products, the request should follow those rules order:
- product is a favorite
- product is a service
- product had stock moves soon
- product update

But this request didn't take into account consumables products and if there was no stock move,
the value was null and postgres consider null values first when ordering desc.
Now with that changes, the order is correctly set based on the rules above.

X-original-commit: fef256b
@robodoo
Copy link
Contributor

robodoo commented Mar 19, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 19, 2024

@rhe-odoo @davidmonnom cherrypicking of pull request #124223 failed.

stdout:

Auto-merging addons/point_of_sale/models/pos_config.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_config.py

stderr:

18:19:49.577622 git.c:463               trace: built-in: git cherry-pick 35a9168a53bded7e13451f4b485443c1b419ea21
error: could not apply 35a9168a53bd... [FIX] point_of_sale: load product requests
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 19, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 19, 2024
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 RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants