diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6994ef32623bffec84fa06e1bd08ab9fb36dbc91..732d0c4a644eb444d6b4385643ff32fab19fab52 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,8 +6,6 @@ exclude: | ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| - # Maybe reactivate this when all README files include prettier ignore tags? - ^README\.md$| # Library files can have extraneous formatting (even minimized) /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying @@ -28,7 +26,7 @@ repos: language: fail files: "\\.rej$" - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 7d8a9f9ad73db0976fb03cbee43d953bc29b89e9 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -46,12 +44,11 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black - additional_dependencies: ["click==8.0.4"] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.1.2 + rev: v2.6.2 hooks: - id: prettier name: prettier (with plugin-xml) @@ -62,7 +59,7 @@ repos: - --plugin=@prettier/plugin-xml files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - repo: https://github.com/pre-commit/mirrors-eslint - rev: v7.8.1 + rev: v8.15.0 hooks: - id: eslint verbose: true @@ -70,7 +67,7 @@ repos: - --color - --fix - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.2.0 hooks: - id: trailing-whitespace # exclude autogenerated files @@ -92,12 +89,12 @@ repos: - id: mixed-line-ending args: ["--fix=lf"] - repo: https://github.com/asottile/pyupgrade - rev: v2.7.2 + rev: v2.32.1 hooks: - id: pyupgrade args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.10.1 hooks: - id: isort name: isort except __init__.py @@ -105,13 +102,13 @@ repos: - --settings=. exclude: /__init__\.py$ - repo: https://gitlab.com/PyCQA/flake8 - rev: 3.8.3 + rev: 3.9.2 hooks: - id: flake8 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 @@ -120,7 +117,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/report/report_scop_adhesion.xml b/report/report_scop_adhesion.xml index 1145b8af1033e5b3261b793b40068706c567619e..e55f7810f540bd3ab8815596c0b371fa8eabd5ea 100644 --- a/report/report_scop_adhesion.xml +++ b/report/report_scop_adhesion.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <odoo> - <data noupdate="1"> + <data noupdate="0"> <template id="report_adhesion_document"> <t t-call="web.external_layout"> <t t-set="o" t-value="o.with_context(lang='fr')" /> <div class="page" style="font-size: 16px;"> - <div class="row"> <div class="col-5 offset-7"> <span @@ -23,7 +22,7 @@ <t t-if="o.cedex"> <span t-field="o.cedex" /></t> </div> </div> - <div class="row mt64"> + <div class="row pt64"> <div class="col-12"> <p> Paris, le @@ -34,7 +33,7 @@ </p> </div> </div> - <div class="row mt32"> + <div class="row pt32"> <div class="col-12" style="text-align: justify;"> <p> Objet : Votre adhésion au Mouvement des Scop et des Scic<br @@ -43,10 +42,10 @@ /> Union Régionale <t t-esc="str(o.ur_id.name)" /> </p> - <p class="mt64"> + <p class="pt64"> Chère Coopératrice, Cher Coopérateur, </p> - <p class="mt32"> + <p class="pt32"> J’ai le plaisir de vous informer que l’adhésion définitive de votre coopérative à la Confédération Générale des Scop et des Scic a été validée par le Bureau de la Direction Nationale<t t-if="o.date_bureau_validation" ><span> </span> qui s’est réuni le <span @@ -67,9 +66,13 @@ <div class="row pt128"> <div class="col-12"> <p> - Jacques LANDRIOT<br/> + Jacques LANDRIOT<br /> Président </p> + <!-- <p>--> + <!-- <img src="/cgscop_adhesion/static/description/signature_president_cg.png"--> + <!-- style="width: 100%;"/>--> + <!-- </p>--> <p class="pt64"><i >P.J. : Notice extranet et dernier numéro du magazine trimestriel « Participer »</i></p> </div>