From 787c549cf9dc6397031ca17fb3ffc3228f79236d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Thu, 3 Nov 2022 11:54:21 +0100 Subject: [PATCH 1/2] [DCK] Updated from template --- .copier-answers.yml | 8 +++++++- .gitignore | 1 - .pre-commit-config.yaml | 12 ++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index cc5e93526..c1e94c1bb 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,9 +1,14 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.5.2 +_commit: v1.11.0 _src_path: gh:oca/oca-addons-repo-template ci: GitHub dependency_installation_mode: PIP generate_requirements_txt: true +github_check_license: true +github_enable_codecov: true +github_enable_makepot: true +github_enable_stale_action: true +github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false odoo_version: 15.0 org_name: Odoo Community Association (OCA) @@ -15,3 +20,4 @@ repo_slug: contract repo_website: https://github.com/OCA/contract travis_apt_packages: [] travis_apt_sources: [] + diff --git a/.gitignore b/.gitignore index 818770fb1..9c283fd41 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ build/ develop-eggs/ dist/ eggs/ -lib/ lib64/ parts/ sdist/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 321268fb2..c6568a7bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -119,19 +119,15 @@ repos: - id: flake8 name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - - repo: https://github.com/PyCQA/pylint - rev: v2.11.1 + - repo: https://github.com/OCA/pylint-odoo + rev: 7.0.2 hooks: - - id: pylint + - id: pylint_odoo name: pylint with optional checks args: - --rcfile=.pylintrc - --exit-zero verbose: true - additional_dependencies: &pylint_deps - - pylint-odoo==5.0.5 - - id: pylint - name: pylint with mandatory checks + - id: pylint_odoo args: - --rcfile=.pylintrc-mandatory - additional_dependencies: *pylint_deps From dc6aeaea6681d9be42d6e0a55898df566a220cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Thu, 3 Nov 2022 12:05:21 +0100 Subject: [PATCH 2/2] [FIX] contract: Change pylint disable --- contract/models/contract.py | 3 ++- contract/models/contract_line.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contract/models/contract.py b/contract/models/contract.py index 130221c72..e3ee22c76 100644 --- a/contract/models/contract.py +++ b/contract/models/contract.py @@ -309,10 +309,11 @@ class ContractContract(models.Model): if date_end and all(date_end): contract.date_end = max(date_end) + # pylint: disable=missing-return @api.depends( "contract_line_ids.recurring_next_date", "contract_line_ids.is_canceled", - ) # pylint: disable=missing-return + ) def _compute_recurring_next_date(self): for contract in self: recurring_next_date = contract.contract_line_ids.filtered( diff --git a/contract/models/contract_line.py b/contract/models/contract_line.py index b909f235b..628a3d025 100644 --- a/contract/models/contract_line.py +++ b/contract/models/contract_line.py @@ -106,9 +106,10 @@ class ContractLine(models.Model): readonly=True, ) + # pylint: disable=missing-return @api.depends( "last_date_invoiced", "date_start", "date_end", "contract_id.last_date_invoiced" - ) # pylint: disable=missing-return + ) def _compute_next_period_date_start(self): """Rectify next period date start if another line in the contract has been already invoiced previously when the recurrence is by contract.