Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 23, 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: #194487
Forward-Port-Of: #194343

@robodoo
Copy link
Contributor

robodoo commented Jan 23, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 23, 2025

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

stdout:

Auto-merging addons/point_of_sale/static/src/app/services/data_service.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/services/data_service.js
Auto-merging addons/point_of_sale/static/src/app/services/pos_store.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/services/pos_store.js
Auto-merging addons/pos_adyen/static/src/app/services/pos_store.js
Auto-merging addons/pos_event/static/src/app/services/pos_store.js
Auto-merging addons/pos_mercado_pago/static/src/app/services/pos_store.js
Auto-merging addons/pos_online_payment/static/src/app/services/pos_store.js
Auto-merging addons/pos_viva_wallet/static/src/app/services/pos_store.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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jan 23, 2025
@C3POdoo C3POdoo added the RD research & development, internal work label Jan 23, 2025
@davidmonnom davidmonnom force-pushed the saas-18.1-saas-17.4-ensure_ws_pos-moda-br0X-fw branch from 8e979f1 to 379e351 Compare January 23, 2025 10:12
@C3POdoo C3POdoo requested review from a team and davidmonnom and removed request for a team January 23, 2025 10:15
@davidmonnom davidmonnom force-pushed the saas-18.1-saas-17.4-ensure_ws_pos-moda-br0X-fw branch from 379e351 to e869bb6 Compare January 23, 2025 11:19
*: 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: 3278353
@davidmonnom davidmonnom force-pushed the saas-18.1-saas-17.4-ensure_ws_pos-moda-br0X-fw branch from e869bb6 to 4169e16 Compare January 23, 2025 14:43
@davidmonnom
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 24, 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 #194775

X-original-commit: 3278353
Related: odoo/enterprise#77619
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
@robodoo robodoo closed this Jan 24, 2025
@fw-bot fw-bot deleted the saas-18.1-saas-17.4-ensure_ws_pos-moda-br0X-fw branch February 7, 2025 04:30
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