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 #124350

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jun 8, 2023

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: #124223

@robodoo
Copy link
Contributor

robodoo commented Jun 8, 2023

@fw-bot
Copy link
Contributor Author

fw-bot commented Jun 8, 2023

@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:20:23.207364 git.c:455               trace: built-in: git cherry-pick 68ef85ca542fe136fc61a8e35ed97b7255174768
error: could not apply 68ef85ca542... [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.

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jun 8, 2023
@C3POdoo C3POdoo added the RD research & development, internal work label Jun 8, 2023
@rhe-odoo rhe-odoo force-pushed the saas-16.3-16.0-pos-loading-product-request-rhe-yCj8-fw branch from f2722ca to d45bdae Compare June 28, 2023 07:07
@C3POdoo C3POdoo requested review from a team and caburj and removed request for a team June 28, 2023 07:09
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: 102791f
@rhe-odoo rhe-odoo force-pushed the saas-16.3-16.0-pos-loading-product-request-rhe-yCj8-fw branch from d45bdae to 5ebb631 Compare June 28, 2023 12:09
@davidmonnom
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jun 29, 2023
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.

closes #124350

X-original-commit: 102791f
Signed-off-by: David Monnom (moda) <moda@odoo.com>
@robodoo robodoo temporarily deployed to merge June 29, 2023 09:20 Inactive
@robodoo robodoo closed this Jun 29, 2023
@fw-bot fw-bot deleted the saas-16.3-16.0-pos-loading-product-request-rhe-yCj8-fw branch July 13, 2023 09:47
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

5 participants