Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 16, 2025

pos*: point_of_sale, pos_hr, pos_loyalty, pos_online_payment_self_order,
pos_restaurant, pos_self_order

In this commit, we adapt the point of sale modules to be compliant with
the belgian restaurant certification.

Enterprise PR: https://github.com/odoo/enterprise/pull/81554


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

Forward-Port-Of: #201578

@robodoo
Copy link
Contributor

robodoo commented Mar 16, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 16, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 16, 2025

@adgu-odoo @caburj cherrypicking of pull request #201578 failed.

stdout:

Auto-merging addons/point_of_sale/data/orders_demo.xml
Auto-merging addons/point_of_sale/models/pos_session.py
Auto-merging addons/point_of_sale/static/src/app/models/pos_order.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/models/pos_order.js
Auto-merging addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
Auto-merging addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
Auto-merging addons/point_of_sale/static/src/app/services/pos_printer_service.js
Auto-merging addons/point_of_sale/static/src/app/services/pos_store.js
Auto-merging addons/pos_hr/models/hr_employee.py
Auto-merging addons/pos_self_order/models/pos_config.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 @robodoo.

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

@C3POdoo C3POdoo added the RD research & development, internal work label Mar 16, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 24, 2025

@adgu-odoo @caburj this forward port of #201578 is awaiting action (not merged or closed).

@adgu-odoo adgu-odoo force-pushed the master-saas-18.2-add-pos-blackbox-be-adgu-422575-fw branch 2 times, most recently from f722057 to b66d767 Compare March 25, 2025 13:54
@C3POdoo C3POdoo requested review from a team and davidmonnom and removed request for a team March 25, 2025 14:16
@adgu-odoo adgu-odoo force-pushed the master-saas-18.2-add-pos-blackbox-be-adgu-422575-fw branch 2 times, most recently from 3beadee to 0f2d17a Compare March 26, 2025 13:23
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 31, 2025

@adgu-odoo @caburj this forward port of #201578 is awaiting action (not merged or closed).

@adgu-odoo adgu-odoo force-pushed the master-saas-18.2-add-pos-blackbox-be-adgu-422575-fw branch from 0f2d17a to 01759d2 Compare April 2, 2025 15:27
pos*: point_of_sale, pos_hr, pos_loyalty, pos_online_payment_self_order,
pos_restaurant, pos_self_order

In this commit, we adapt the point of sale modules to be compliant with
the belgian restaurant certification.
@adgu-odoo adgu-odoo force-pushed the master-saas-18.2-add-pos-blackbox-be-adgu-422575-fw branch from 01759d2 to 4382eb6 Compare April 3, 2025 12:26
@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 7, 2025

@adgu-odoo @caburj this forward port of #201578 is awaiting action (not merged or closed).

@adgu-odoo
Copy link
Contributor

robodoo r+

robodoo pushed a commit that referenced this pull request Apr 8, 2025
pos*: point_of_sale, pos_hr, pos_loyalty, pos_online_payment_self_order,
pos_restaurant, pos_self_order

In this commit, we adapt the point of sale modules to be compliant with
the belgian restaurant certification.

closes #201979

Related: odoo/enterprise#81554
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
@robodoo robodoo added the 18.3 label Apr 8, 2025
@robodoo robodoo closed this Apr 8, 2025
@fw-bot fw-bot deleted the master-saas-18.2-add-pos-blackbox-be-adgu-422575-fw branch April 15, 2025 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

18.3 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