Skip to content

Conversation

fw-bot
Copy link
Contributor

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

Changes to the synchronization system to ensure full synchronization every time a PoS writes to a record.

This synchronization will not unlink local records in other PoS.

Forward-Port-Of: #191904

@robodoo
Copy link
Contributor

robodoo commented Jan 3, 2025

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 3, 2025

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

stdout:

Auto-merging addons/point_of_sale/models/pos_config.py
Auto-merging addons/point_of_sale/models/pos_order.py
CONFLICT (content): Merge conflict in addons/point_of_sale/models/pos_order.py
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/models/pos_order.js
Auto-merging addons/point_of_sale/static/src/app/models/related_models.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/models/related_models.js
Auto-merging addons/point_of_sale/static/src/app/navbar/closing_popup/closing_popup.js
Auto-merging addons/point_of_sale/static/src/app/navbar/navbar.xml
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/navbar/navbar.xml
Auto-merging addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
Auto-merging addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.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
Auto-merging addons/pos_loyalty/static/src/overrides/models/pos_order.js
Auto-merging addons/pos_restaurant/models/pos_order.py
CONFLICT (content): Merge conflict in addons/pos_restaurant/models/pos_order.py
Auto-merging addons/pos_restaurant/models/pos_restaurant.py
Auto-merging addons/pos_restaurant/static/src/overrides/models/pos_store.js
CONFLICT (content): Merge conflict in addons/pos_restaurant/static/src/overrides/models/pos_store.js
Auto-merging addons/pos_restaurant/static/tests/tours/pos_restaurant_tour.js
CONFLICT (content): Merge conflict in addons/pos_restaurant/static/tests/tours/pos_restaurant_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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jan 3, 2025
@C3POdoo C3POdoo added the RD research & development, internal work label Jan 3, 2025
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-aggressive_sync_poc-moda-SrL7-fw branch from 84fad06 to caddb2e Compare January 3, 2025 16:04
@C3POdoo C3POdoo requested review from a team and caburj and removed request for a team January 3, 2025 16:07
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-aggressive_sync_poc-moda-SrL7-fw branch 3 times, most recently from 172eac5 to 5b8817e Compare January 6, 2025 10:29
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-aggressive_sync_poc-moda-SrL7-fw branch from 5b8817e to 1b1cabe Compare January 6, 2025 13:07
Changes to the synchronization system to ensure full synchronization
every time a PoS writes to a record.

This synchronization will not unlink local records in other PoS.
@davidmonnom davidmonnom force-pushed the 18.0-saas-17.4-aggressive_sync_poc-moda-SrL7-fw branch from 1b1cabe to 37cad4d Compare January 6, 2025 14:09
@davidmonnom
Copy link
Contributor

@robodoo r+

@robodoo robodoo closed this in a3fc8f7 Jan 6, 2025
@fw-bot fw-bot deleted the 18.0-saas-17.4-aggressive_sync_poc-moda-SrL7-fw branch January 20, 2025 18:12
gamarino pushed a commit to numaes/numa-public-odoo that referenced this pull request Jan 24, 2025
Changes to the synchronization system to ensure full synchronization
every time a PoS writes to a record.

This synchronization will not unlink local records in other PoS.

closes odoo/odoo#192357

Related: odoo/enterprise#76465
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