Skip to content

Revert "Merge branch 'master' into master" #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivs-cetmix merged 1 commit into from
Nov 8, 2025
Merged

Revert "Merge branch 'master' into master" #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified template/module/static/description/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions template/module/static/description/icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon1/README.expected-acme.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

=======
addon 1
=======
Expand Down
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon1/README.expected-oca.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

=======
addon 1
=======
Expand Down
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

====================
addon one maintainer
====================
Expand Down
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

====================
addon one maintainer
====================
Expand Down
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

====================
addon one maintainer
====================
Expand Down
4 changes: 4 additions & 0 deletions tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

====================
addon one maintainer
====================
Expand Down
4 changes: 3 additions & 1 deletion tests/test_towncrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ def test_oca_towncrier_md(tmp_path):
"""\
## 14.0.1.0.1 (2021-12-31)

Bugfixes: Bugfix description. (50)
### Bugfixes

- Bugfix description. ([#50](https://github.com/OCA/therepo/issues/50))
"""
)
4 changes: 4 additions & 0 deletions tools/gen_addon_readme.rst.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
{% endif %}
{%- endmacro -%}

.. image:: https://odoo-community.org/readme-banner-image
:target: https://odoo-community.org/get-involved?utm_source=readme
:alt: Odoo Community Association

{{ '=' * manifest.name|length }}
{{ manifest.name }}
{{ '=' * manifest.name|length }}
Expand Down
4 changes: 3 additions & 1 deletion tools/oca_towncrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@


def _make_issue_format(org, repo, fragment_format):
return "{issue}"
if fragment_format == "md":
return f"[#{{issue}}](https://github.com/{org}/{repo}/issues/{{issue}})"
return f"`#{{issue}} <https://github.com/{org}/{repo}/issues/{{issue}}>`_"


def _get_towncrier_template(fragment_format):
Expand Down
2 changes: 1 addition & 1 deletion tools/ocb-sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

ODOO="[email protected]:/odoo/odoo.git"
OCB="[email protected]:/OCA/OCB.git"
BRANCHES="19.0 18.0 17.0 16.0 15.0 14.0"
BRANCHES="19.0 18.0 17.0 16.0 15.0"
GITDIR="/var/tmp/git"
PUBDIR="/var/tmp/ocb-nightly"
BUILDDIR="/var/tmp/ocb-build"
Expand Down
4 changes: 3 additions & 1 deletion tools/towncrier-template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@

{% if sections[section] %}
{% for category, val in definitions.items() if category in sections[section] %}
### {{ definitions[category]['name'] }}

{% if definitions[category]['showcontent'] %}
{% for text, values in sections[section][category].items() %}
- {{ definitions[category]['name'] }}: {{ text }}
- {{ text }}
{%- if values %}
{% if "\n - " in text or '\n * ' in text %}

Expand Down