Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Nov 29, 2024
1 parent 600f611 commit 54d484e
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 26 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ addon | version | maintainers | summary
[website_sale_hide_price](website_sale_hide_price/) | 17.0.1.1.1 | | Hide product prices on the shop
[website_sale_product_description](website_sale_product_description/) | 17.0.1.0.0 | | Shows custom e-Commerce description for products
[website_sale_product_reference_displayed](website_sale_product_reference_displayed/) | 17.0.1.0.0 | | Display product reference in e-commerce
[website_sale_require_legal](website_sale_require_legal/) | 17.0.1.0.0 | | Force the user to accept legal tems to buy in the web shop
[website_sale_suggest_create_account](website_sale_suggest_create_account/) | 17.0.1.0.0 | | Suggest users to create an account when buying in the website

[//]: # (end addons)
Expand Down
3 changes: 2 additions & 1 deletion setup/_metapackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[project]
name = "odoo-addons-oca-e-commerce"
version = "17.0.20241024.0"
version = "17.0.20241129.0"
dependencies = [
"odoo-addon-website_sale_b2x_alt_price>=17.0dev,<17.1dev",
"odoo-addon-website_sale_hide_price>=17.0dev,<17.1dev",
"odoo-addon-website_sale_product_description>=17.0dev,<17.1dev",
"odoo-addon-website_sale_product_reference_displayed>=17.0dev,<17.1dev",
"odoo-addon-website_sale_require_legal>=17.0dev,<17.1dev",
"odoo-addon-website_sale_suggest_create_account>=17.0dev,<17.1dev",
]
classifiers=[
Expand Down
36 changes: 18 additions & 18 deletions website_sale_require_legal/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Require accepting legal terms to checkout
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:fb7818797158569b096d297241bf594892e1cf2b346237ca602f4f900edd90b6
!! source digest: sha256:110fc2437cf0a83c09c41f0e87bf5281edfcc18d1471243bd25fc01b38162e13
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -89,19 +89,19 @@ Usage

To use this module, you need to:

- Buy something from your website.
- Buy something from your website.

Known issues / Roadmap
======================

- Shopping terms and conditions are accepted only on user registration
or address edition. So if those terms change after the user signed
up, a notification should be made. An implicit acceptance could be
printed in the payment screen to solve this. Maybe that could be a
work to develop in another module.
- If you enable both acceptance views as explained in the configuration
section, first-time buyers will have to accept the legal terms
between 2 and 3 times to buy.
- Shopping terms and conditions are accepted only on user registration
or address edition. So if those terms change after the user signed up,
a notification should be made. An implicit acceptance could be printed
in the payment screen to solve this. Maybe that could be a work to
develop in another module.
- If you enable both acceptance views as explained in the configuration
section, first-time buyers will have to accept the legal terms between
2 and 3 times to buy.

Bug Tracker
===========
Expand All @@ -124,15 +124,15 @@ Authors
Contributors
------------

- `Tecnativa <https://www.tecnativa.com>`__:
- `Tecnativa <https://www.tecnativa.com>`__:

- Rafael Blasco
- Jairo Llopis
- Vicent Cubells
- David Vidal
- Ernesto Tejeda
- Cristina Martin R.
- Pilar Vargas
- Rafael Blasco
- Jairo Llopis
- Vicent Cubells
- David Vidal
- Ernesto Tejeda
- Cristina Martin R.
- Pilar Vargas

Maintainers
-----------
Expand Down
14 changes: 7 additions & 7 deletions website_sale_require_legal/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Require accepting legal terms to checkout</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:fb7818797158569b096d297241bf594892e1cf2b346237ca602f4f900edd90b6
!! source digest: sha256:110fc2437cf0a83c09c41f0e87bf5281edfcc18d1471243bd25fc01b38162e13
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/17.0/website_sale_require_legal"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/e-commerce-17-0/e-commerce-17-0-website_sale_require_legal"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends your e-commerce legal compliance options:</p>
Expand Down Expand Up @@ -440,13 +440,13 @@ <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h1>
<ul class="simple">
<li>Shopping terms and conditions are accepted only on user registration
or address edition. So if those terms change after the user signed
up, a notification should be made. An implicit acceptance could be
printed in the payment screen to solve this. Maybe that could be a
work to develop in another module.</li>
or address edition. So if those terms change after the user signed up,
a notification should be made. An implicit acceptance could be printed
in the payment screen to solve this. Maybe that could be a work to
develop in another module.</li>
<li>If you enable both acceptance views as explained in the configuration
section, first-time buyers will have to accept the legal terms
between 2 and 3 times to buy.</li>
section, first-time buyers will have to accept the legal terms between
2 and 3 times to buy.</li>
</ul>
</div>
<div class="section" id="bug-tracker">
Expand Down

0 comments on commit 54d484e

Please sign in to comment.