Merge branch 'master' into master

ivs-cetmix · web-flow · commit 368f7e953648 · 2025-11-04T15:15:20.000+01:00
diff --git a/template/module/static/description/icon.png b/template/module/static/description/icon.png
diff --git a/template/module/static/description/icon.svg b/template/module/static/description/icon.svg
diff --git a/tests/data/readme_tests/addon1/README.expected-acme.rst b/tests/data/readme_tests/addon1/README.expected-acme.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =======
 addon 1
 =======
diff --git a/tests/data/readme_tests/addon1/README.expected-oca.rst b/tests/data/readme_tests/addon1/README.expected-oca.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =======
 addon 1
 =======
diff --git a/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst b/tests/data/readme_tests/addon_one_maintainer/README.expected-acme.rst
@@ -1,7 +1,3 @@
-.. 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
 ====================
diff --git a/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst b/tests/data/readme_tests/addon_one_maintainer/README.expected-oca.rst
@@ -1,7 +1,3 @@
-.. 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
 ====================
diff --git a/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst b/tests/data/readme_tests/addon_two_maintainers/README.expected-acme.rst
@@ -1,7 +1,3 @@
-.. 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
 ====================
diff --git a/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst b/tests/data/readme_tests/addon_two_maintainers/README.expected-oca.rst
@@ -1,7 +1,3 @@
-.. 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
 ====================
diff --git a/tests/test_towncrier.py b/tests/test_towncrier.py
@@ -98,8 +98,6 @@ def test_oca_towncrier_md(tmp_path):
         """\
             ## 14.0.1.0.1 (2021-12-31)
 
-            ### Bugfixes
-
-            - Bugfix description. ([#50](https://github.com/OCA/therepo/issues/50))
+            Bugfixes: Bugfix description. (50)
         """
     )
diff --git a/tools/gen_addon_readme.rst.jinja b/tools/gen_addon_readme.rst.jinja
@@ -7,10 +7,6 @@
 {% 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 }}
diff --git a/tools/oca_towncrier.py b/tools/oca_towncrier.py
@@ -17,9 +17,7 @@
 
 
 def _make_issue_format(org, repo, fragment_format):
-    if fragment_format == "md":
-        return f"[#{{issue}}](https://github.com/{org}/{repo}/issues/{{issue}})"
-    return f"`#{{issue}} <https://github.com/{org}/{repo}/issues/{{issue}}>`_"
+    return "{issue}"
 
 
 def _get_towncrier_template(fragment_format):
diff --git a/tools/ocb-sync.sh b/tools/ocb-sync.sh
@@ -8,7 +8,7 @@
 
 ODOO="git@github.com:/odoo/odoo.git"
 OCB="git@github.com:/OCA/OCB.git"
-BRANCHES="19.0 18.0 17.0 16.0 15.0"
+BRANCHES="19.0 18.0 17.0 16.0 15.0 14.0"
 GITDIR="/var/tmp/git"
 PUBDIR="/var/tmp/ocb-nightly"
 BUILDDIR="/var/tmp/ocb-build"
diff --git a/tools/towncrier-template.md b/tools/towncrier-template.md
@@ -13,11 +13,9 @@
 
 {% 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() %}
-- {{ text }}
+- {{ definitions[category]['name'] }}: {{ text }}
 {%- if values %}
 {% if "\n  - " in text or '\n  * ' in text %}
 

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,6 @@ def test_oca_towncrier_md(tmp_path):`
`98`	`98`	`"""\`
`99`	`99`	`## 14.0.1.0.1 (2021-12-31)`
`100`	`100`
`101`		`- ### Bugfixes`
`102`		`-`
`103`		`- - Bugfix description. ([#50](https://github.com/OCA/therepo/issues/50))`
	`101`	`+ Bugfixes: Bugfix description. (50)`
`104`	`102`	`"""`
`105`	`103`	`)`