Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 21, 2025

This commit ensures that the websocket connection is established when receiving a connect or initialized event.

This can happen in multitab use of Odoo.

Forward-Port-Of: #194343

@robodoo
Copy link
Contributor

robodoo commented Jan 21, 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 Jan 21, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 21, 2025

@davidmonnom @caburj cherrypicking of pull request #194343 failed.

stdout:

Auto-merging addons/point_of_sale/static/src/app/models/data_service.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/models/data_service.js
Auto-merging addons/point_of_sale/static/src/app/store/pos_store.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/store/pos_store.js
CONFLICT (modify/delete): addons/point_of_sale/static/tests/unit/pos_app_tests.js deleted in e9ebe37f30a3486a966993d8c3c8ffb04fb3fc08 and modified in 642c2482b7a03af80c90037e90235f0249108f62.  Version 642c2482b7a03af80c90037e90235f0249108f62 of addons/point_of_sale/static/tests/unit/pos_app_tests.js left in tree.
Auto-merging addons/pos_online_payment_self_order/static/src/self_order_service.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

@C3POdoo C3POdoo added the RD research & development, internal work label Jan 21, 2025
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-ensure_ws_pos-moda-NLlO-fw branch from 43deb2f to ac996c5 Compare January 21, 2025 11:48
@C3POdoo C3POdoo requested review from a team and davidmonnom and removed request for a team January 21, 2025 11:51
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-ensure_ws_pos-moda-NLlO-fw branch from ac996c5 to 499a431 Compare January 22, 2025 09:57
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

X-original-commit: a98e5e6
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-ensure_ws_pos-moda-NLlO-fw branch from 499a431 to 705ea5a Compare January 22, 2025 11:47
@davidmonnom
Copy link
Contributor

@robodoo r+

@robodoo robodoo closed this in 3278353 Jan 23, 2025
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 23, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 26, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Jan 27, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo/odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 29, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
adhoc-cicd-bot pushed a commit to adhoc-cicd/odoo-odoo that referenced this pull request Jan 29, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
@fw-bot fw-bot deleted the 18.0-saas-17.4-ensure_ws_pos-moda-NLlO-fw branch February 6, 2025 05:11
StephaneMangin pushed a commit to camptocamp/odoo that referenced this pull request Feb 6, 2025
*: pos_adyen, pos_event, pos_mercado_pago, pos_online_payment,
pos_viva_wallet

This commit ensures that the websocket connection is established when
receiving a connect or initialized event.

This can happen in multitab use of Odoo.

closes odoo#194487

X-original-commit: a98e5e6
Related: odoo/enterprise#77477
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@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