diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..bfd7ac53df9f103f6dc8853738c63fd364445fde --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# Configuration for known file extensions +[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{json,yml,yaml,rst,md}] +indent_size = 2 + +# Do not configure editor for libs and autogenerated content +[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}] +charset = unset +end_of_line = unset +indent_size = unset +indent_style = unset +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/.eslintrc.yml b/.eslintrc.yml new file mode 100644 index 0000000000000000000000000000000000000000..d4cc423ccda9db9691205c9da83307af97b2670f --- /dev/null +++ b/.eslintrc.yml @@ -0,0 +1,187 @@ +env: + browser: true + es6: true + +# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 +parserOptions: + ecmaVersion: 2017 + +overrides: + - files: + - "**/*.esm.js" + parserOptions: + sourceType: module + +# Globals available in Odoo that shouldn't produce errorings +globals: + _: readonly + $: readonly + fuzzy: readonly + jQuery: readonly + moment: readonly + odoo: readonly + openerp: readonly + owl: 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 +rules: + accessor-pairs: warn + array-callback-return: warn + callback-return: warn + capitalized-comments: + - warn + - always + - ignoreConsecutiveComments: true + ignoreInlineComments: true + complexity: + - warn + - 15 + constructor-super: warn + dot-notation: warn + eqeqeq: warn + global-require: warn + handle-callback-err: warn + id-blacklist: warn + id-match: warn + init-declarations: error + max-depth: warn + max-nested-callbacks: warn + max-statements-per-line: warn + no-alert: warn + no-array-constructor: warn + no-caller: warn + no-case-declarations: warn + no-class-assign: warn + no-cond-assign: error + no-const-assign: error + no-constant-condition: warn + no-control-regex: warn + no-debugger: error + no-delete-var: warn + no-div-regex: warn + no-dupe-args: error + no-dupe-class-members: error + no-dupe-keys: error + no-duplicate-case: error + no-duplicate-imports: error + no-else-return: warn + no-empty-character-class: warn + no-empty-function: error + no-empty-pattern: error + no-empty: warn + no-eq-null: error + no-eval: error + no-ex-assign: error + no-extend-native: warn + no-extra-bind: warn + no-extra-boolean-cast: warn + no-extra-label: warn + no-fallthrough: warn + no-func-assign: error + no-global-assign: error + no-implicit-coercion: + - warn + - allow: ["~"] + no-implicit-globals: warn + no-implied-eval: warn + no-inline-comments: warn + no-inner-declarations: warn + no-invalid-regexp: warn + no-irregular-whitespace: warn + no-iterator: warn + no-label-var: warn + no-labels: warn + no-lone-blocks: warn + no-lonely-if: error + no-mixed-requires: error + no-multi-str: warn + no-native-reassign: error + no-negated-condition: warn + no-negated-in-lhs: error + no-new-func: warn + no-new-object: warn + no-new-require: warn + no-new-symbol: warn + no-new-wrappers: warn + no-new: warn + no-obj-calls: warn + no-octal-escape: warn + no-octal: warn + no-param-reassign: warn + no-path-concat: warn + no-process-env: warn + no-process-exit: warn + no-proto: warn + no-prototype-builtins: warn + no-redeclare: warn + no-regex-spaces: warn + no-restricted-globals: warn + no-restricted-imports: warn + no-restricted-modules: warn + no-restricted-syntax: warn + no-return-assign: error + no-script-url: warn + no-self-assign: warn + no-self-compare: warn + no-sequences: warn + no-shadow-restricted-names: warn + no-shadow: warn + no-sparse-arrays: warn + no-sync: warn + no-this-before-super: warn + no-throw-literal: warn + no-undef-init: warn + no-undef: error + no-unmodified-loop-condition: warn + no-unneeded-ternary: error + no-unreachable: error + no-unsafe-finally: error + no-unused-expressions: error + no-unused-labels: error + no-unused-vars: error + no-use-before-define: error + no-useless-call: warn + no-useless-computed-key: warn + no-useless-concat: warn + no-useless-constructor: warn + no-useless-escape: warn + no-useless-rename: warn + no-void: warn + no-with: warn + operator-assignment: [error, always] + prefer-const: warn + radix: warn + require-yield: warn + sort-imports: warn + spaced-comment: [error, always] + strict: [error, function] + use-isnan: error + valid-jsdoc: + - warn + - prefer: + arg: param + argument: param + augments: extends + constructor: class + exception: throws + func: function + method: function + prop: property + return: returns + virtual: abstract + yield: yields + preferType: + array: Array + bool: Boolean + boolean: Boolean + number: Number + object: Object + str: String + string: String + requireParamDescription: false + requireReturn: false + requireReturnDescription: false + requireReturnType: false + valid-typeof: warn + yoda: warn diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000000000000000000000000000000000..e397e8ed4e3e7f7fe7785dd391bb80aa6d85575e --- /dev/null +++ b/.flake8 @@ -0,0 +1,12 @@ +[flake8] +max-line-length = 88 +max-complexity = 16 +# B = bugbear +# B9 = bugbear opinionated (incl line length) +select = C,E,F,W,B,B9 +# E203: whitespace before ':' (black behaviour) +# E501: flake8 line length (covered by bugbear B950) +# W503: line break before binary operator (black behaviour) +ignore = E203,E501,W503 +per-file-ignores= + __init__.py:F401 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..818770fb1bdc0a144e924c9a5940f0b035df8a0d --- /dev/null +++ b/.gitignore @@ -0,0 +1,75 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +/.venv +/.pytest_cache + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg +*.eggs + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Pycharm +.idea + +# Eclipse +.settings + +# Visual Studio cache/options directory +.vs/ +.vscode + +# OSX Files +.DS_Store + +# Django stuff: +*.log + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Sphinx documentation +docs/_build/ + +# Backup files +*~ +*.swp + +# OCA rules +!static/lib/ diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000000000000000000000000000000000..0ec187efd1bf802844749f508cda0c8f138970f9 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,13 @@ +[settings] +; see https://github.com/psf/black +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +combine_as_imports=True +use_parentheses=True +line_length=88 +known_odoo=odoo +known_odoo_addons=odoo.addons +sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER +default_section=THIRDPARTY +ensure_newline_before_comments = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1c6434bfc2274c73d98dbf62b6de9baccdc353ce --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,127 @@ +exclude: | + (?x) + # NOT INSTALLABLE ADDONS + # END NOT INSTALLABLE ADDONS + # Files and folders generated by bots, to avoid loops + ^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 + ^docs/_templates/.*\.html$| + # You don't usually want a bot to modify your legal texts + (LICENSE.*|COPYING.*) +default_language_version: + python: python3 + node: "14.13.0" +repos: + - repo: local + hooks: + # These files are most likely copier diff rejection junks; if found, + # review them manually, fix the problem (if needed) and remove them + - id: forbidden-files + name: forbidden files + entry: found forbidden files; remove them + language: fail + files: "\\.rej$" + - repo: https://github.com/oca/maintainer-tools + rev: ab1d7f6 + hooks: + # update the NOT INSTALLABLE ADDONS section above + - id: oca-update-pre-commit-excluded-addons + - id: oca-fix-manifest-website + args: ["https://le-filament.com"] + - repo: https://github.com/myint/autoflake + rev: v1.4 + hooks: + - id: autoflake + args: + - --expand-star-imports + - --ignore-init-module-imports + - --in-place + - --remove-all-unused-imports + - --remove-duplicate-keys + - --remove-unused-variables + - repo: https://github.com/psf/black + rev: 20.8b1 + hooks: + - id: black + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.1.2 + hooks: + - id: prettier + name: prettier (with plugin-xml) + additional_dependencies: + - "prettier@2.1.2" + - "@prettier/plugin-xml@0.12.0" + args: + - --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 + hooks: + - id: eslint + verbose: true + args: + - --color + - --fix + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: end-of-file-fixer + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: debug-statements + - id: fix-encoding-pragma + args: ["--remove"] + - id: check-case-conflict + - id: check-docstring-first + - id: check-executables-have-shebangs + - id: check-merge-conflict + # exclude files where underlines are not distinguishable from merge conflicts + exclude: /README\.rst$|^docs/.*\.rst$ + - id: check-symlinks + - id: check-xml + - id: mixed-line-ending + args: ["--fix=lf"] + - repo: https://github.com/asottile/pyupgrade + rev: v2.7.2 + hooks: + - id: pyupgrade + args: ["--keep-percent-format"] + - repo: https://github.com/PyCQA/isort + rev: 5.5.1 + hooks: + - id: isort + name: isort except __init__.py + args: + - --settings=. + exclude: /__init__\.py$ + - repo: https://gitlab.com/PyCQA/flake8 + rev: 3.8.3 + hooks: + - id: flake8 + name: flake8 + additional_dependencies: ["flake8-bugbear==20.1.4"] + - repo: https://github.com/PyCQA/pylint + rev: pylint-2.5.3 + hooks: + - id: pylint + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true + additional_dependencies: &pylint_deps + - pylint-odoo==3.5.0 + - id: pylint + name: pylint with mandatory checks + args: + - --rcfile=.pylintrc-mandatory + additional_dependencies: *pylint_deps diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000000000000000000000000000000000000..5b6d4b361ace92f3877993bf2848fac190d8fab6 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,8 @@ +# Defaults for all prettier-supported languages. +# Prettier will complete this with settings from .editorconfig file. +bracketSpacing: false +printWidth: 88 +proseWrap: always +semi: true +trailingComma: "es5" +xmlWhitespaceSensitivity: "strict" diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000000000000000000000000000000000000..dc6270e15be0c08da00e768a570f27c785d8630e --- /dev/null +++ b/.pylintrc @@ -0,0 +1,87 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Le Filament +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=14.0 + +[MESSAGES CONTROL] +disable=all + +# This .pylintrc contains optional AND mandatory checks and is meant to be +# loaded in an IDE to have it check everything, in the hope this will make +# optional checks more visible to contributors who otherwise never look at a +# green travis to see optional checks that failed. +# .pylintrc-mandatory containing only mandatory checks is used the pre-commit +# config as a blocking check. + +enable=anomalous-backslash-in-string, + api-one-deprecated, + api-one-multi-together, + assignment-from-none, + attribute-deprecated, + class-camelcase, + dangerous-default-value, + dangerous-view-replace-wo-priority, + development-status-allowed, + duplicate-id-csv, + duplicate-key, + duplicate-xml-fields, + duplicate-xml-record-id, + eval-referenced, + eval-used, + incoherent-interpreter-exec-perm, + license-allowed, + manifest-author-string, + manifest-deprecated-key, + manifest-required-author, + manifest-required-key, + manifest-version-format, + method-compute, + method-inverse, + method-required-super, + method-search, + openerp-exception-warning, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + redundant-modulename-xml, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + sql-injection, + too-few-format-args, + translation-field, + translation-required, + unreachable, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error, + # messages that do not cause the lint step to fail + consider-merging-classes-inherited, + create-user-wo-reset-password, + dangerous-filter-wo-user, + deprecated-module, + file-not-used, + invalid-commit, + missing-manifest-dependency, + missing-newline-extrafiles, + no-utf8-coding-comment, + odoo-addons-relative-import, + old-api7-method-defined, + redefined-builtin, + too-complex, + unnecessary-utf8-coding-comment + + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory new file mode 100644 index 0000000000000000000000000000000000000000..43ea23947166ff8080219007cfae43ec54a28f8e --- /dev/null +++ b/.pylintrc-mandatory @@ -0,0 +1,64 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Le Filament +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=14.0 + +[MESSAGES CONTROL] +disable=all + +enable=anomalous-backslash-in-string, + api-one-deprecated, + api-one-multi-together, + assignment-from-none, + attribute-deprecated, + class-camelcase, + dangerous-default-value, + dangerous-view-replace-wo-priority, + development-status-allowed, + duplicate-id-csv, + duplicate-key, + duplicate-xml-fields, + duplicate-xml-record-id, + eval-referenced, + eval-used, + incoherent-interpreter-exec-perm, + license-allowed, + manifest-author-string, + manifest-deprecated-key, + manifest-required-author, + manifest-required-key, + manifest-version-format, + method-compute, + method-inverse, + method-required-super, + method-search, + openerp-exception-warning, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + redundant-modulename-xml, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + sql-injection, + too-few-format-args, + translation-field, + translation-required, + unreachable, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no diff --git a/README.rst b/README.rst old mode 100755 new mode 100644 diff --git a/__init__.py b/__init__.py old mode 100755 new mode 100644 diff --git a/__manifest__.py b/__manifest__.py old mode 100755 new mode 100644 index d82121d101f9327c47d3a908bd3678bc4462326e..086f9c2938088429b5a6e805c0d9979410f9180e --- a/__manifest__.py +++ b/__manifest__.py @@ -2,19 +2,15 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - 'name': "CG Scop - Account Check Deposit", - 'summary': "Adaptation du module de remise de cheques", - 'author': "Le Filament", - 'website': "https://www.le-filament.com", - 'version': '12.0.1.0.1', - 'license': "AGPL-3", - 'depends': [ - 'account', - 'account_check_deposit' - ], - 'data': [ - 'views/account_deposit.xml', - 'report/report_check_deposit.xml', + "name": "CG Scop - Account Check Deposit", + "summary": "Adaptation du module de remise de cheques", + "author": "Le Filament", + "website": "https://www.le-filament.com", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "depends": ["account", "account_check_deposit"], + "data": [ + "views/account_deposit.xml", + "report/report_check_deposit.xml", ], - } diff --git a/models/__init__.py b/models/__init__.py old mode 100755 new mode 100644 diff --git a/models/account_deposit.py b/models/account_deposit.py index 9a84632659d3c19d539f50cc3ee9b9499f9f2372..a54ef2ec3de396721bf44d5f81b1109eea27c9f6 100644 --- a/models/account_deposit.py +++ b/models/account_deposit.py @@ -1,15 +1,16 @@ # Copyright 2020 Le Filament # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import fields, models, api +from odoo import fields, models class AccountCheckDeposit(models.Model): - _inherit = 'account.check.deposit' + _inherit = "account.check.deposit" slip_number = fields.Char( - string='Référence du Bordereau', - states={'done': [('readonly', '=', True)]}) + string="Référence du Bordereau", + states={"done": [("readonly", "=", True)]}, + ) comment = fields.Text("Commentaire") # ------------------------------------------------------ @@ -21,9 +22,11 @@ class AccountCheckDeposit(models.Model): lambda l: len(l.partner_id.bank_ids) == 0 ) if lines_not_bank: - self.comment = "Aucune banque configurée pour les coopératives suivantes : \n" + self.comment = ( + "Aucune banque configurée pour les coopératives suivantes : \n" + ) for line in lines_not_bank: - self.comment += ' - %s\n' % line.partner_id.name + self.comment += " - %s\n" % line.partner_id.name # ------------------------------------------------------ # Common function diff --git a/report/report_check_deposit.xml b/report/report_check_deposit.xml index fc3a60e9faec69f69ed45138c91642e6e6bd828d..055c15ee24ef312cf9d7760103c60ef9d5e17f1e 100644 --- a/report/report_check_deposit.xml +++ b/report/report_check_deposit.xml @@ -1,19 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" ?> <odoo> <!-- Copyright 2020 Le Filament License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <data> - <template id="report_checkdeposit" inherit_id="account_check_deposit.report_checkdeposit"> + <template + id="report_checkdeposit" + inherit_id="account_check_deposit.report_checkdeposit" + > <xpath expr="//div[hasclass('page')]" position="replace"> <div class="page"> <!-- Header Address --> <div class="row"> <div class="col-5 offset-7 mt16 mb32"> <p> - <span t-field="o.bank_journal_id.bank_account_id.bank_id.name" style="font-weight: 600; text-transform: uppercase;"/><br/> + <span + t-field="o.bank_journal_id.bank_account_id.bank_id.name" + style="font-weight: 600; text-transform: uppercase;" + /><br /> </p> <p> - <span t-field="o.company_id.partner_id.city" />, le <span t-field="o.deposit_date"/> + <span + t-field="o.company_id.partner_id.city" + />, le <span t-field="o.deposit_date" /> </p> </div> </div> @@ -24,21 +32,30 @@ Madame, Monsieur, </p> <p> - Veuillez porter au crédit de notre compte le montant de la remise ci-dessous.<br/> + Veuillez porter au crédit de notre compte le montant de la remise ci-dessous.<br + /> Vous en remerciant par avance, nous vous prions d'agréer, Madame, Monsieur, nos respectueuses salutations. </p> </div> </div> <div class="row mt32"> <div class="col-12"> - <h5 style="border: 2px solid #333; padding: 5px; font-weight: 600;" class="text-center mb32"> - Bordereau d'accompagnement<br/> + <h5 + style="border: 2px solid #333; padding: 5px; font-weight: 600;" + class="text-center mb32" + > + Bordereau d'accompagnement<br /> Remises de chèques </h5> <p> - <span t-field="o.company_id.partner_id.name" style="font-weight: 600; text-transform: uppercase;"/><br/> - <span t-field="o.company_id.partner_id.street" /><br/> - <span t-field="o.company_id.partner_id.zip" /> <span t-field="o.company_id.partner_id.city" /> + <span + t-field="o.company_id.partner_id.name" + style="font-weight: 600; text-transform: uppercase;" + /><br /> + <span t-field="o.company_id.partner_id.street" /><br /> + <span t-field="o.company_id.partner_id.zip" /> <span + t-field="o.company_id.partner_id.city" + /> </p> </div> </div> @@ -47,13 +64,17 @@ <table class="table table-sm"> <tr> <td>Banque :</td> - <td><b><span t-field="o.bank_journal_id.bank_account_id.bank_id.name"/></b></td> + <td><b><span + t-field="o.bank_journal_id.bank_account_id.bank_id.name" + /></b></td> <td>Devise :</td> <td><b>Euro</b></td> </tr> <tr> <td>RIB :</td> - <td><b><span t-field="o.bank_journal_id.bank_account_id.acc_number" /></b></td> + <td><b><span + t-field="o.bank_journal_id.bank_account_id.acc_number" + /></b></td> <td>Référence remise :</td> <td><b><span t-field="o.slip_number" /></b></td> </tr> @@ -75,32 +96,50 @@ <tbody> <t t-foreach="o.check_payment_ids" t-as="move_line"> <tr> - <td><span t-field="move_line.partner_id.member_number"/></td> - <td><span t-field="move_line.partner_id.name"/></td> + <td><span + t-field="move_line.partner_id.member_number" + /></td> + <td><span + t-field="move_line.partner_id.name" + /></td> <td> <t t-if="o.get_bank(move_line)"> - <span t-esc="o.get_bank(move_line).bank_id.name"/> + <span + t-esc="o.get_bank(move_line).bank_id.name" + /> </t> </td> <td> - <span t-field="move_line.ref"/> + <span t-field="move_line.ref" /> </td> <td> - <t t-if="o.currency_id == o.company_id.currency_id"> - <span t-field="move_line.debit" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> + <t + t-if="o.currency_id == o.company_id.currency_id" + > + <span + t-field="move_line.debit" + t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}' + /> </t> - <t t-if="o.currency_id != o.company_id.currency_id"> - <span t-field="move_line.amount_currency" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> + <t + t-if="o.currency_id != o.company_id.currency_id" + > + <span + t-field="move_line.amount_currency" + t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}' + /> </t> </td> </tr> </t> <tr> - <td></td> - <td></td> - <td></td> + <td /> + <td /> + <td /> <td><b>Total:</b></td> - <td><b><span t-field="o.total_amount"/> €</b></td> + <td><b><span + t-field="o.total_amount" + /> €</b></td> </tr> </tbody> </table> @@ -109,25 +148,39 @@ <!-- Resume --> <div class="row mt64"> <div class="col-4"> - <div style="border: 1px solid #aaa; padding: 10px; height: 150px;" class="text-center"> - Date de remise : <b><span t-field="o.deposit_date"/></b> - <hr/> - <span class="text-center">Référence</span><br/> - <b><span t-field="o.slip_number" class="text-center"/></b> + <div + style="border: 1px solid #aaa; padding: 10px; height: 150px;" + class="text-center" + > + Date de remise : <b><span + t-field="o.deposit_date" + /></b> + <hr /> + <span class="text-center">Référence</span><br /> + <b><span + t-field="o.slip_number" + class="text-center" + /></b> </div> </div> <div class="col-4"> - <div style="border: 1px solid #aaa; padding: 10px; height: 150px;" class="text-center"> - Nombre de pièces : <span t-field="o.check_count"/> - <hr/> + <div + style="border: 1px solid #aaa; padding: 10px; height: 150px;" + class="text-center" + > + Nombre de pièces : <span t-field="o.check_count" /> + <hr /> <span class="text-center">Signature</span> </div> </div> <div class="col-4"> - <div style="border: 1px solid #aaa; padding: 10px; height: 150px;" class="text-center"> + <div + style="border: 1px solid #aaa; padding: 10px; height: 150px;" + class="text-center" + > Total remise - <hr/> - <b><span t-field="o.total_amount"/> €</b> + <hr /> + <b><span t-field="o.total_amount" /> €</b> </div> </div> </div> @@ -135,4 +188,4 @@ </xpath> </template> </data> -</odoo> \ No newline at end of file +</odoo> diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv deleted file mode 100755 index 97dd8b917b8a258799a3ebf0095f13ff73d7cf68..0000000000000000000000000000000000000000 --- a/security/ir.model.access.csv +++ /dev/null @@ -1 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink diff --git a/static/description/icon.png b/static/description/icon.png old mode 100755 new mode 100644 index 82ef47760a441cf229b5009f0a18ccf3842fbfa5..499652a2c9c0307f875bafc145b6fbafa133da72 Binary files a/static/description/icon.png and b/static/description/icon.png differ diff --git a/views/account_deposit.xml b/views/account_deposit.xml index 12157ffebcb3c829a9df0bfbe38c82bc5395866d..a0cdfa1835fb947fd29e16a6da7dfee4cf271ed7 100644 --- a/views/account_deposit.xml +++ b/views/account_deposit.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <!-- Copyright 2020 Le Filament License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> @@ -7,18 +7,25 @@ <record id="account_check_deposit_view_form_inherit" model="ir.ui.view"> <field name="name">account.check.deposit.form</field> <field name="model">account.check.deposit</field> - <field name="inherit_id" ref="account_check_deposit.account_check_deposit_view_form"/> + <field + name="inherit_id" + ref="account_check_deposit.account_check_deposit_view_form" + /> <field name="arch" type="xml"> <xpath expr="//field[@name='bank_journal_id']" position="after"> - <field name="slip_number" required="1"/> - <button string="Check banques" type="object" name="check_bank"/> + <field name="slip_number" required="1" /> + <button string="Check banques" type="object" name="check_bank" /> </xpath> <xpath expr="//group[@name='check_payments']" position="before"> - <div class="alert alert-danger" role="alert" attrs="{'invisible':[('comment', '=', False)]}"> - <field class="o_field_header" name="comment" readonly="1"/> + <div + class="alert alert-danger" + role="alert" + attrs="{'invisible':[('comment', '=', False)]}" + > + <field class="o_field_header" name="comment" readonly="1" /> </div> </xpath> </field> </record> </data> -</odoo> \ No newline at end of file +</odoo>