diff --git a/.copier-answers.yml b/.copier-answers.yml index d0f6e14ea..baf80b715 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.14.2 +_commit: v1.17.2 _src_path: gh:oca/oca-addons-repo-template ci: GitHub -dependency_installation_mode: PIP generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -11,6 +10,7 @@ github_enable_makepot: true github_enable_stale_action: true github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: Both odoo_version: 14.0 org_name: Odoo Community Association (OCA) org_slug: OCA @@ -19,6 +19,4 @@ repo_description: Odoo modules related to Human Resources expenses management. repo_name: Human Resources Expenses repo_slug: hr-expense repo_website: https://github.com/OCA/hr-expense -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 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 755f8a225..602ecbca2 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 215b84b0f..326c12556 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -50,7 +50,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 f00857c71..aafc09511 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,8 @@ 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)$| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +35,24 @@ 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/OCA/hr-expense"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=hr-expense + - --if-source-changed + - 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/hr_expense_petty_cash/i18n/hr_expense_petty_cash.pot b/hr_expense_petty_cash/i18n/hr_expense_petty_cash.pot index f0e4b663c..a47a36277 100644 --- a/hr_expense_petty_cash/i18n/hr_expense_petty_cash.pot +++ b/hr_expense_petty_cash/i18n/hr_expense_petty_cash.pot @@ -156,7 +156,6 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:hr_expense_petty_cash.hr_expense_sheet_view_search_inherit #: model_terms:ir.ui.view,arch_db:hr_expense_petty_cash.hr_expense_view_search_inherit #: model_terms:ir.ui.view,arch_db:hr_expense_petty_cash.view_petty_cash_form -#: model_terms:ir.ui.view,arch_db:hr_expense_petty_cash.view_petty_cash_list #: model_terms:ir.ui.view,arch_db:hr_expense_petty_cash.view_petty_cash_search msgid "Petty Cash" msgstr "" diff --git a/hr_expense_petty_cash/views/petty_cash_views.xml b/hr_expense_petty_cash/views/petty_cash_views.xml index 29d58b170..88b1c0e20 100644 --- a/hr_expense_petty_cash/views/petty_cash_views.xml +++ b/hr_expense_petty_cash/views/petty_cash_views.xml @@ -35,7 +35,7 @@ petty.cash.list petty.cash - + diff --git a/hr_expense_sequence/i18n/hr_expense_sequence.pot b/hr_expense_sequence/i18n/hr_expense_sequence.pot index 6ee39fe5a..f4af60f59 100644 --- a/hr_expense_sequence/i18n/hr_expense_sequence.pot +++ b/hr_expense_sequence/i18n/hr_expense_sequence.pot @@ -23,11 +23,6 @@ msgstr "" msgid "Expense Report" msgstr "" -#. module: hr_expense_sequence -#: model_terms:ir.ui.view,arch_db:hr_expense_sequence.report_expense_sheet -msgid "Expenses Report" -msgstr "" - #. module: hr_expense_sequence #: model:ir.model.fields,field_description:hr_expense_sequence.field_hr_expense_sheet__id msgid "ID" diff --git a/hr_expense_sequence/report/report_expense_sheet.xml b/hr_expense_sequence/report/report_expense_sheet.xml index 360c055cc..971086973 100644 --- a/hr_expense_sequence/report/report_expense_sheet.xml +++ b/hr_expense_sequence/report/report_expense_sheet.xml @@ -1,11 +1,8 @@ diff --git a/hr_expense_sheet_payment_state/views/hr_expense_views.xml b/hr_expense_sheet_payment_state/views/hr_expense_views.xml index 18b9ba835..af6f1ddd6 100644 --- a/hr_expense_sheet_payment_state/views/hr_expense_views.xml +++ b/hr_expense_sheet_payment_state/views/hr_expense_views.xml @@ -1,5 +1,4 @@ - hr.expense.sheet.tree.payment.state @@ -21,6 +20,7 @@ hr.expense.sheet.form.payment.state hr.expense.sheet + 100