From 225f6350265e3d9f477b9b6c96dd1c0b71331fd8 Mon Sep 17 00:00:00 2001 From: JasminSForgeFlow Date: Tue, 19 May 2026 07:11:21 +0000 Subject: [PATCH 1/2] [IMP] *: copier update to v1.42 Includes upstream checklog-odoo.cfg ignore for the transient chrome zombie shutdown warning that was failing CI on valid PRs. --- .copier-answers.yml | 3 +-- .github/workflows/pre-commit.yml | 5 ++++- .github/workflows/test.yml | 7 +++++++ .pre-commit-config.yaml | 9 +++++++-- .pylintrc | 9 --------- README.md | 5 +++-- checklog-odoo.cfg | 2 ++ 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 86636e6098..30e4f70564 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,7 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.35 +_commit: v1.42 _src_path: git+https://github.com/OCA/oca-addons-repo-template additional_ruff_rules: [] -ci: GitHub convert_readme_fragments_to_markdown: true enable_checklog_odoo: true generate_requirements_txt: true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index d61380e4fd..e6a9e52be2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,3 +1,4 @@ + name: pre-commit on: @@ -16,7 +17,9 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" + cache: 'pip' + cache-dependency-path: '.pre-commit-config.yaml' - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6101a2b026..2bdca74015 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,6 +65,13 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests + - name: Upload screenshots from JS tests + uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: Screenshots of failed JS tests - ${{ matrix.name }}${{ join(matrix.include) }} + path: /tmp/odoo_tests/${{ env.PGDATABASE }} + if-no-files-found: ignore - uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c99d471421..33fc30011f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ exclude: | # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: - python: python3 + python: python3.12 node: "22.9.0" repos: - repo: local @@ -38,6 +38,11 @@ repos: entry: found a en.po file language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' + - id: obsolete dotfiles + name: obsolete dotfiles + entry: found obsolete files; remove them + files: '^(\.travis\.yml|\.t2d\.yml|CONTRIBUTING\.md|\.prettierrc\.yml|\.eslintrc\.yml)$' + language: fail - repo: https://github.com/sbidoul/whool rev: v1.3 hooks: @@ -60,7 +65,7 @@ repos: - --convert-fragments-to-markdown - id: oca-gen-external-dependencies - repo: https://github.com/OCA/odoo-pre-commit-hooks - rev: v0.1.6 + rev: v0.1.7 hooks: - id: oca-checks-odoo-module - id: oca-checks-po diff --git a/.pylintrc b/.pylintrc index f3d017a8f5..a7aec2a055 100644 --- a/.pylintrc +++ b/.pylintrc @@ -92,20 +92,11 @@ enable=anomalous-backslash-in-string, no-write-in-compute, # messages that do not cause the lint step to fail consider-merging-classes-inherited, - create-user-wo-reset-password, - dangerous-filter-wo-user, deprecated-module, - file-not-used, invalid-commit, - missing-manifest-dependency, - missing-newline-extrafiles, missing-readme, - no-utf8-coding-comment, odoo-addons-relative-import, - old-api7-method-defined, redefined-builtin, - too-complex, - unnecessary-utf8-coding-comment, manifest-external-assets diff --git a/README.md b/README.md index 76281bf5b1..f47b2fcb56 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ +[![Support the OCA](https://odoo-community.org/readme-banner-image)](https://odoo-community.org/get-involved?utm_source=repo-readme) + +# e-commerce [![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=19.0) [![Pre-commit Status](https://github.com/OCA/e-commerce/actions/workflows/pre-commit.yml/badge.svg?branch=19.0)](https://github.com/OCA/e-commerce/actions/workflows/pre-commit.yml?query=branch%3A19.0) [![Build Status](https://github.com/OCA/e-commerce/actions/workflows/test.yml/badge.svg?branch=19.0)](https://github.com/OCA/e-commerce/actions/workflows/test.yml?query=branch%3A19.0) @@ -7,8 +10,6 @@ -# e-commerce - e-commerce diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg index 0b55b7bf66..58d43aa666 100644 --- a/checklog-odoo.cfg +++ b/checklog-odoo.cfg @@ -1,3 +1,5 @@ [checklog-odoo] ignore= WARNING.* 0 failed, 0 error\(s\).* + WARNING .* Killing chrome descendants-or-self .* + WARNING.* Missing widget: res_partner_many2one for field of type many2one.* From 47ce9c1012c7ee3a81ac13aa66537d3ca32bb11e Mon Sep 17 00:00:00 2001 From: Nils Coenen Date: Tue, 19 May 2026 11:31:34 +0000 Subject: [PATCH 2/2] Translated using Weblate (German) Currently translated at 100.0% (15 of 15 strings) Translation: e-commerce-19.0/e-commerce-19.0-website_sale_checkout_skip_payment Translate-URL: https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_checkout_skip_payment/de/ --- website_sale_checkout_skip_payment/i18n/de.po | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/website_sale_checkout_skip_payment/i18n/de.po b/website_sale_checkout_skip_payment/i18n/de.po index 9bf9fef394..6669a9ebc0 100644 --- a/website_sale_checkout_skip_payment/i18n/de.po +++ b/website_sale_checkout_skip_payment/i18n/de.po @@ -9,25 +9,26 @@ msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-18 10:04+0000\n" -"PO-Revision-Date: 2021-05-18 12:11+0200\n" -"Last-Translator: Carlos \n" +"PO-Revision-Date: 2026-05-19 13:46+0000\n" +"Last-Translator: Nils Coenen \n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.6\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.15.2\n" #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons msgid "or" -msgstr "" +msgstr "oder" #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons msgid "Confirm " msgstr "" +"Bestätigen " #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.confirmation_order_error @@ -35,53 +36,58 @@ msgid "" "Error! An error occurred trying to\n" " confirm the sale order." msgstr "" +"Fehler! Beim Versuch, den Verkaufsauftrag zu bestätigen, \n" +" ist ein Fehler aufgetreten." #. module: website_sale_checkout_skip_payment #: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__checkout_skip_payment msgid "Checkout Skip Payment" -msgstr "" +msgstr "Checkout – Zahlung überspringen" #. module: website_sale_checkout_skip_payment #: model:ir.model,name:website_sale_checkout_skip_payment.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurationseinstellungen" #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.navigation_buttons msgid "Confirm" -msgstr "" +msgstr "Bestätigen" #. module: website_sale_checkout_skip_payment #: model:ir.model,name:website_sale_checkout_skip_payment.model_res_partner msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.res_config_settings_view_form msgid "Message shown to the user when the purchase is finished" msgstr "" +"Nachricht, die dem Benutzer angezeigt wird, wenn der Kauf abgeschlossen ist." #. module: website_sale_checkout_skip_payment #. odoo-python #: code:addons/website_sale_checkout_skip_payment/models/website.py:0 msgid "Our team will check your order and send you payment information soon." msgstr "" +"Unser Team wird Ihre Bestellung prüfen und Ihnen in Kürze die " +"Zahlungsinformationen zusenden." #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.res_config_settings_view_form msgid "Sale Checkout Skip Message" -msgstr "" +msgstr "Verkaufs-Checkout Nachricht beim überspringen" #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.confirmation_order_error msgid "Shop - Confirmation - Error" -msgstr "" +msgstr "Shop – Bestätigung – Fehler" #. module: website_sale_checkout_skip_payment #: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_partner__skip_website_checkout_payment #: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_users__skip_website_checkout_payment msgid "Skip Website Checkout Payment" -msgstr "" +msgstr "Website-Checkout Zahlung überspringen" #. module: website_sale_checkout_skip_payment #: model:ir.model,name:website_sale_checkout_skip_payment.model_website @@ -91,9 +97,9 @@ msgstr "Webseite" #. module: website_sale_checkout_skip_payment #: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_config_settings__website_sale_checkout_skip_message msgid "Website Sale Checkout Skip Message" -msgstr "" +msgstr "Nachricht beim Überspringen des Website-Checkout" #. module: website_sale_checkout_skip_payment #: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__website_sale_checkout_skip_message msgid "Website Sale SKip Message" -msgstr "" +msgstr "Website-Verkauf Nachtricht beim überspringen"