Skip to content

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Dec 27, 2024

pos*: pos_restaurant, pos_preparation_display

Before this commit:

  • Splitting an order caused the loss of ordered and unordered quantity
    information for the order lines.

After this commit:

  • Ordered and unordered quantity information is preserved for all order lines.
  • Preparation display quantities remain unaffected.

Task - 4114041

Forward-Port-Of: #179481

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Dec 27, 2024
@robodoo
Copy link
Contributor

robodoo commented Dec 27, 2024

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Dec 27, 2024

@parp-odoo @adgu-odoo cherrypicking of pull request #179481 failed.

stdout:

Auto-merging addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js
CONFLICT (content): Merge conflict in addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js
Auto-merging addons/pos_restaurant/static/tests/tours/split_bill_screen_tour.js

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

@parp-odoo parp-odoo force-pushed the 18.0-master-pos-fix-management-of-splitted-orders-in-kitchen-display-parp-Du-G-fw branch from 8b5f45a to b0bd0c5 Compare December 27, 2024 10:06
@C3POdoo C3POdoo requested review from a team and davidmonnom and removed request for a team December 27, 2024 10:08
@C3POdoo C3POdoo added the RD research & development, internal work label Dec 27, 2024
@parp-odoo parp-odoo force-pushed the 18.0-master-pos-fix-management-of-splitted-orders-in-kitchen-display-parp-Du-G-fw branch 2 times, most recently from 9b3cab0 to 2755d67 Compare December 27, 2024 11:34
pos*: pos_restaurant, pos_preparation_display

Before this commit:
==============
- Splitting an order caused the loss of ordered and unordered quantity
  information for the order lines.

After this commit:
==============
- Ordered and unordered quantity information is preserved for all order lines.
- Preparation display quantities remain unaffected.

Task - 4114041

X-original-commit: 0f76e1f
@parp-odoo parp-odoo force-pushed the 18.0-master-pos-fix-management-of-splitted-orders-in-kitchen-display-parp-Du-G-fw branch from 2755d67 to c2973de Compare December 27, 2024 13:06
@parp-odoo
Copy link
Contributor

robodoo r+

@robodoo robodoo closed this in faeb2c7 Dec 30, 2024
@fw-bot fw-bot deleted the 18.0-master-pos-fix-management-of-splitted-orders-in-kitchen-display-parp-Du-G-fw branch January 13, 2025 05:40
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Jan 24, 2025
pos*: pos_restaurant, pos_preparation_display

Before this commit:
==============
- Splitting an order caused the loss of ordered and unordered quantity
  information for the order lines.

After this commit:
==============
- Ordered and unordered quantity information is preserved for all order lines.
- Preparation display quantities remain unaffected.

Task - 4114041

closes odoo/odoo#191870

X-original-commit: 0f76e1f25eb1040bb04b5e6a3123540ee1df0e15
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Parthkumar Patel (parp) <parp@odoo.com>
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.

4 participants