diff --git a/.copier-answers.yml b/.copier-answers.yml index a8d9e2dfa..eeb5cfeaf 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,7 +1,8 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.17.2 +_commit: v1.21.1 _src_path: https://github.com/OCA/oca-addons-repo-template.git ci: GitHub +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -19,4 +20,6 @@ repo_description: All-in-One Property Management System (PMS) focused on medium- repo_name: Property Management System repo_slug: pms repo_website: https://github.com/OCA/pms +use_pyproject_toml: false +use_ruff: false diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1693a1253..fa17fcd4e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Stale PRs and issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # General settings. @@ -48,7 +48,7 @@ jobs: # * Issues that are pending more information # * Except Issues marked as "no stale" - name: Needs more information stale issues policy - uses: actions/stale@v4 + uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} ascending: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 326c12556..d069c6a2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,9 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - name: Update .pot files run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }} diff --git a/.gitignore b/.gitignore index 9c283fd41..0090721f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.oca_hooks.cfg b/.oca_hooks.cfg new file mode 100644 index 000000000..1f3e3e426 --- /dev/null +++ b/.oca_hooks.cfg @@ -0,0 +1,2 @@ +[MESSAGES_CONTROL] +disable=xml-deprecated-data-node,xml-deprecated-tree-attribute diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d740a4ac1..038be6800 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,10 @@ exclude: | ^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/| + # Ignore test files in addons + /tests/samples/.*| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -35,7 +39,7 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: 969238e47c07d0c40573acff81d170f63245d738 + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -48,6 +52,7 @@ repos: - --org-name=OCA - --repo-name=pms - --if-source-changed + - --keep-source-digest - repo: https://github.com/OCA/odoo-pre-commit-hooks rev: v0.0.25 hooks: diff --git a/pms/models/res_country.py b/pms/models/res_country.py index ddec605f9..953355a97 100644 --- a/pms/models/res_country.py +++ b/pms/models/res_country.py @@ -1,9 +1,9 @@ -from odoo import fields, models, api +from odoo import fields, models class Country(models.Model): - _inherit = 'res.country' - _description = 'Country' - _order = 'priority, name' + _inherit = "res.country" + _description = "Country" + _order = "priority, name" - priority = fields.Integer(string='Priority', default=1000) + priority = fields.Integer(string="Priority", default=1000) diff --git a/pms_l10n_es/data/pms_data.xml b/pms_l10n_es/data/pms_data.xml index f3da5287b..541759efd 100644 --- a/pms_l10n_es/data/pms_data.xml +++ b/pms_l10n_es/data/pms_data.xml @@ -3,7 +3,7 @@ DNI D - + 10 letters = { @@ -48,7 +48,7 @@ else: Spanish Residence permit N 30 - + permit_first_letter=id_number.name[0:1] permit_last_letter = id_number.name[ @@ -76,9 +76,9 @@ else: 05 + id="pms.document_type_european_residence" + model="res.partner.id_category" + > 05 @@ -88,9 +88,9 @@ else: 06 + id="pms.document_type_identification_document" + model="res.partner.id_category" + > 06 diff --git a/pms_l10n_es/wizards/traveller_report.py b/pms_l10n_es/wizards/traveller_report.py index b9d5aea55..533fd3bca 100644 --- a/pms_l10n_es/wizards/traveller_report.py +++ b/pms_l10n_es/wizards/traveller_report.py @@ -1,12 +1,10 @@ import base64 import datetime -import io import json import logging import re import time -import PyPDF2 import requests from bs4 import BeautifulSoup as bs from dateutil.relativedelta import relativedelta @@ -247,9 +245,7 @@ class TravellerReport(models.TransientModel): "/e-hotel/hospederia/generarInformeFichero" ) - post_receipt_acknowledgment_route2 = ( - "/e-hotel/hospederia/pdfInformeFichero" - ) + post_receipt_acknowledgment_route2 = "/e-hotel/hospederia/pdfInformeFichero" logout_route = "/e-hotel/execute_logout" target_date = self.date_target or fields.date.today() session = requests.session() @@ -316,7 +312,9 @@ class TravellerReport(models.TransientModel): verify=False, data={ "jsonHiddenComunes": "", - "ficheroJ": json.loads(upload_result.content.decode('latin-1'))['ficheroJ'], + "ficheroJ": json.loads(upload_result.content.decode("latin-1"))[ + "ficheroJ" + ], "_csrf": token, }, )