diff --git a/.copier-answers.yml b/.copier-answers.yml index d482298d..1c9518b4 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,14 +1,17 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.3.6 +_commit: v1.5.2 _src_path: gh:oca/oca-addons-repo-template ci: Travis dependency_installation_mode: PIP generate_requirements_txt: true include_wkhtmltopdf: false odoo_version: 14.0 +org_name: Odoo Community Association (OCA) +org_slug: OCA rebel_module_groups: [] repo_description: 'TODO: add repo description.' repo_name: account-financial-reporting repo_slug: account-financial-reporting +repo_website: https://github.com/OCA/account-financial-reporting travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423c..9429bc68 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -4,7 +4,7 @@ env: # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 parserOptions: - ecmaVersion: 2017 + ecmaVersion: 2019 overrides: - files: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 80ab1a21..a7a13904 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,7 +2,12 @@ name: pre-commit on: pull_request: + branches: + - "14.0*" push: + branches: + - "14.0" + - "14.0-ocabot-*" jobs: pre-commit: @@ -10,11 +15,21 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 with: - # The pylint-odoo version we use here does not support python 3.10 - # https://github.com/OCA/oca-addons-repo-template/issues/80 - # We also need to pin to an older version of python for older odoo versions - # where we are not using black > 21. Older black versions won't work with - # Python 3.9.8+, and we can't bump black without reformatting. - python-version: "3.9.7" - - uses: pre-commit/action@v2.0.0 + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Install pre-commit + run: pip install pre-commit + - name: Run pre-commit + run: pre-commit run --all-files --show-diff-on-failure --color=always + - name: Check that all files generated by pre-commit are in git + run: | + newfiles="$(git ls-files --others --exclude-from=.gitignore)" + if [ "$newfiles" != "" ] ; then + echo "Please check-in the following files:" + echo "$newfiles" + exit 1 + fi diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ebb39c3..a391760f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier @@ -120,7 +120,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==20.1.4"] - repo: https://github.com/PyCQA/pylint - rev: pylint-2.5.3 + rev: v2.11.1 hooks: - id: pylint name: pylint with optional checks @@ -129,7 +129,7 @@ repos: - --exit-zero verbose: true additional_dependencies: &pylint_deps - - pylint-odoo==3.5.0 + - pylint-odoo==5.0.5 - id: pylint name: pylint with mandatory checks args: diff --git a/README.md b/README.md index 7f9adfff..5aa6a0be 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/91/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-account-financial-reporting-91) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=14.0) [![Build Status](https://travis-ci.com/OCA/account-financial-reporting.svg?branch=14.0)](https://travis-ci.com/OCA/account-financial-reporting) [![codecov](https://codecov.io/gh/OCA/account-financial-reporting/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/account-financial-reporting) [![Translation Status](https://translation.odoo-community.org/widgets/account-financial-reporting-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/account-financial-reporting-14-0/?utm_source=widget) @@ -34,12 +35,11 @@ addon | version | maintainers | summary This repository is licensed under [AGPL-3.0](LICENSE). -However, each module can have a totally different license, as long as they adhere to OCA +However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA) policy. Consult each module's `__manifest__.py` file, which contains a `license` key that explains its license. ---- - OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. diff --git a/account_financial_report/models/account_group.py b/account_financial_report/models/account_group.py index fef6d73f..bcc89e6d 100644 --- a/account_financial_report/models/account_group.py +++ b/account_financial_report/models/account_group.py @@ -29,7 +29,7 @@ class AccountGroup(models.Model): @api.depends("name", "parent_id.complete_name") def _compute_complete_name(self): - """ Forms complete name of location from parent location to child location. """ + """Forms complete name of location from parent location to child location.""" for group in self: if group.parent_id.complete_name: group.complete_name = "{}/{}".format( @@ -40,7 +40,7 @@ class AccountGroup(models.Model): @api.depends("code_prefix_start", "parent_id.complete_code") def _compute_complete_code(self): - """ Forms complete code of location from parent location to child location. """ + """Forms complete code of location from parent location to child location.""" for group in self: if group.parent_id.complete_code: group.complete_code = "{}/{}".format( diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py index 4fc2872e..e232efe3 100644 --- a/account_financial_report/report/abstract_report_xlsx.py +++ b/account_financial_report/report/abstract_report_xlsx.py @@ -524,7 +524,7 @@ class AbstractReportXslx(models.AbstractModel): report_data["row_pos"] += 1 def _get_currency_amt_format(self, line_object, report_data): - """ Return amount format specific for each currency. """ + """Return amount format specific for each currency.""" if "account_group_id" in line_object and line_object["account_group_id"]: format_amt = report_data["formats"]["format_amount_bold"] field_prefix = "format_amount_bold" @@ -545,7 +545,7 @@ class AbstractReportXslx(models.AbstractModel): return format_amt def _get_currency_amt_format_dict(self, line_dict, report_data): - """ Return amount format specific for each currency. """ + """Return amount format specific for each currency.""" if line_dict.get("account_group_id", False) and line_dict["account_group_id"]: format_amt = report_data["formats"]["format_amount_bold"] field_prefix = "format_amount_bold" @@ -568,7 +568,7 @@ class AbstractReportXslx(models.AbstractModel): return format_amt def _get_currency_amt_header_format(self, line_object, report_data): - """ Return amount header format for each currency. """ + """Return amount header format for each currency.""" format_amt = report_data["formats"]["format_header_amount"] if line_object.currency_id: field_name = "format_header_amount_%s" % line_object.currency_id.name @@ -586,7 +586,7 @@ class AbstractReportXslx(models.AbstractModel): return format_amt def _get_currency_amt_header_format_dict(self, line_object, report_data): - """ Return amount header format for each currency. """ + """Return amount header format for each currency.""" format_amt = report_data["formats"]["format_header_amount"] if line_object["currency_id"]: field_name = "format_header_amount_%s" % line_object["currency_name"] diff --git a/account_financial_report/report/aged_partner_balance_xlsx.py b/account_financial_report/report/aged_partner_balance_xlsx.py index def43e97..769ee2df 100644 --- a/account_financial_report/report/aged_partner_balance_xlsx.py +++ b/account_financial_report/report/aged_partner_balance_xlsx.py @@ -40,7 +40,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 3: { - "header": _(u"Age ≤ 30 d."), + "header": _("Age ≤ 30 d."), "field": "30_days", "field_footer_total": "30_days", "field_footer_percent": "percent_30_days", @@ -48,7 +48,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 4: { - "header": _(u"Age ≤ 60 d."), + "header": _("Age ≤ 60 d."), "field": "60_days", "field_footer_total": "60_days", "field_footer_percent": "percent_60_days", @@ -56,7 +56,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 5: { - "header": _(u"Age ≤ 90 d."), + "header": _("Age ≤ 90 d."), "field": "90_days", "field_footer_total": "90_days", "field_footer_percent": "percent_90_days", @@ -64,7 +64,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 6: { - "header": _(u"Age ≤ 120 d."), + "header": _("Age ≤ 120 d."), "field": "120_days", "field_footer_total": "120_days", "field_footer_percent": "percent_120_days", @@ -106,7 +106,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 9: { - "header": _(u"Age ≤ 30 d."), + "header": _("Age ≤ 30 d."), "field": "30_days", "field_footer_total": "30_days", "field_footer_percent": "percent_30_days", @@ -115,7 +115,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 10: { - "header": _(u"Age ≤ 60 d."), + "header": _("Age ≤ 60 d."), "field": "60_days", "field_footer_total": "60_days", "field_footer_percent": "percent_60_days", @@ -124,7 +124,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 11: { - "header": _(u"Age ≤ 90 d."), + "header": _("Age ≤ 90 d."), "field": "90_days", "field_footer_total": "90_days", "field_footer_percent": "percent_90_days", @@ -133,7 +133,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel): "width": 14, }, 12: { - "header": _(u"Age ≤ 120 d."), + "header": _("Age ≤ 120 d."), "field": "120_days", "field_footer_total": "120_days", "field_footer_percent": "percent_120_days", diff --git a/partner_statement/tests/test_activity_statement.py b/partner_statement/tests/test_activity_statement.py index ac052286..7b78c67b 100644 --- a/partner_statement/tests/test_activity_statement.py +++ b/partner_statement/tests/test_activity_statement.py @@ -8,7 +8,7 @@ from odoo.tests.common import TransactionCase class TestActivityStatement(TransactionCase): - """ Tests for Activity Statement.""" + """Tests for Activity Statement.""" def setUp(self): super().setUp() diff --git a/partner_statement/tests/test_outstanding_statement.py b/partner_statement/tests/test_outstanding_statement.py index 7481e804..baede255 100644 --- a/partner_statement/tests/test_outstanding_statement.py +++ b/partner_statement/tests/test_outstanding_statement.py @@ -5,7 +5,7 @@ from odoo.tests.common import TransactionCase class TestOutstandingStatement(TransactionCase): - """ Tests for Outstanding Statement.""" + """Tests for Outstanding Statement.""" def setUp(self): super().setUp()