Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 1, 2025

If prevent zero sale is active, prices should be hidden from the page

opw-4650460

See also: https://github.com/odoo/enterprise/pull/82082


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

Forward-Port-Of: #204210
Forward-Port-Of: #202867

@robodoo
Copy link
Contributor

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

fw-bot commented Apr 1, 2025

@livaios cherrypicking of pull request #202867 failed.

stdout:

Auto-merging addons/website_sale/models/product_template.py
Auto-merging addons/website_sale/views/templates.xml
CONFLICT (content): Merge conflict in addons/website_sale/views/templates.xml

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 OE the report is linked to a support ticket (opw-...) label Apr 1, 2025
@livaios livaios force-pushed the saas-18.2-17.0-remove-price-prevent-zero-sale-liew-426774-fw branch 2 times, most recently from 0883748 to ed31ef1 Compare April 1, 2025 17:31
@livaios
Copy link
Contributor

livaios commented Apr 1, 2025

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Apr 1, 2025

@livaios 'ci/runbot' failed on this reviewed PR.

@livaios livaios force-pushed the saas-18.2-17.0-remove-price-prevent-zero-sale-liew-426774-fw branch 2 times, most recently from 273b47b to dfaec47 Compare April 2, 2025 15:23
@livaios
Copy link
Contributor

livaios commented Apr 2, 2025

Hello @chevalierv,

Here is the amended fix, I will create the backport for it right away

If prevent zero sale is active, prices should be hidden from the page

opw-4650460

X-original-commit: 3ca11f2
@livaios livaios force-pushed the saas-18.2-17.0-remove-price-prevent-zero-sale-liew-426774-fw branch from dfaec47 to f2517b4 Compare April 2, 2025 15:44
@livaios
Copy link
Contributor

livaios commented Apr 2, 2025

@robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Apr 2, 2025

@livaios linked pull request(s) odoo/enterprise#82685 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit that referenced this pull request Apr 3, 2025
If prevent zero sale is active, prices should be hidden from the page

opw-4650460

closes #204340

X-original-commit: 3ca11f2
Related: odoo/enterprise#82685
Signed-off-by: Lina Eweis (liew) <liew@odoo.com>
@robodoo robodoo closed this Apr 3, 2025
@fw-bot fw-bot deleted the saas-18.2-17.0-remove-price-prevent-zero-sale-liew-426774-fw branch April 10, 2025 10:19
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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants