diff --git a/.copier-answers.yml b/.copier-answers.yml index cf1125d..85e9da8 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: 5a39237 +_commit: a7bd24b _src_path: https://github.com/grap/oca-addons-repo-template-new.git ci: GitHub -dependency_installation_mode: PIP generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -12,6 +11,7 @@ github_enable_stale_action: false github_enforce_dev_status_compatibility: false include_wkhtmltopdf: false odoo_real_version: 12.0 +odoo_test_flavor: Odoo odoo_version: 16.0 org_name: GRAP org_slug: grap @@ -21,6 +21,4 @@ repo_description: This project contains extra-addons modules for the project Odo repo_name: Integrated Trade Modules For Odoo repo_slug: odoo-addons-intercompany-trade repo_website: https://github.com/grap/odoo-addons-intercompany-trade -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index cee2fda..1a35ecb 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,6 +22,7 @@ globals: odoo: readonly openerp: readonly owl: readonly + luxon: readonly # Styling is handled by Prettier, so we only need to enable AST rules; # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 0d7e59c..611d336 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit run: pre-commit run --all-files --show-diff-on-failure --color=always + env: + # Consider valid a PR that changes README fragments but doesn't + # change the README.rst file itself. It's not really a problem + # because the bot will update it anyway after merge. This way, we + # lower the barrier for functional contributors that want to fix the + # readme fragments, while still letting developers get README + # auto-generated (which also helps functionals when using runboat). + # DOCS https://pre-commit.com/#temporarily-disabling-hooks + SKIP: oca-gen-addon-readme - name: Check that all files generated by pre-commit are in git run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6e33a2..cb0356f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,8 +19,8 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo12.0:latest - makepot: "false" name: test with Odoo + makepot: "false" services: postgres: image: postgres:9.6 @@ -31,7 +31,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e64606b..26f1871 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,6 +15,10 @@ exclude: | /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| + # Don't bother non-technical authors with formatting issues in docs + readme/.*\.(rst|md)$| + # Ignore build and dist directories in addons + /build/|/dist/| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -36,13 +40,17 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 969238e47c07d0c40573acff81d170f63245d738 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://github.com/grap/odoo-addons-intercompany-trade"] - + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po - repo: https://github.com/myint/autoflake rev: v1.4 hooks: diff --git a/intercompany_trade_account/demo/account_journal.xml b/intercompany_trade_account/demo/account_journal.xml index 2165f11..3d6c719 100644 --- a/intercompany_trade_account/demo/account_journal.xml +++ b/intercompany_trade_account/demo/account_journal.xml @@ -5,8 +5,7 @@ Copyright (C) 2015 - Today: GRAP (http://www.grap.coop) License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> - - + Intercompany Trade - Customer Purchase Journal @@ -21,5 +20,4 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). sale - diff --git a/intercompany_trade_base/views/view_intercompany_trade_config.xml b/intercompany_trade_base/views/view_intercompany_trade_config.xml index c1ef3de..01c0e09 100644 --- a/intercompany_trade_base/views/view_intercompany_trade_config.xml +++ b/intercompany_trade_base/views/view_intercompany_trade_config.xml @@ -9,7 +9,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). intercompany.trade.config - +