From f9fd6e44031d5b4b542671a31bb671b343e93cf8 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Wed, 30 Mar 2022 15:10:06 +0200
Subject: [PATCH] [mig] migration to 14.0 + add pre-commit changes
---
.editorconfig | 20 ++
.eslintrc.yml | 187 ++++++++++++++++++
.flake8 | 12 ++
.gitignore | 78 +++++++-
.isort.cfg | 13 ++
.pre-commit-config.yaml | 127 ++++++++++++
.prettierrc.yml | 8 +
.pylintrc | 87 +++++++++
.pylintrc-mandatory | 64 ++++++
README.rst | 0
__init__.py | 43 +++--
__manifest__.py | 13 +-
migration/14.0.1.0.0/post-migration.py | 23 +++
migration/14.0.1.0.0/pre-migration.py | 13 ++
models/__init__.py | 4 +-
models/account_invoice.py | 109 -----------
models/account_move.py | 125 ++++++++++++
models/account_payment_order.py | 92 +++++----
models/chart_template.py | 18 +-
models/res_company.py | 16 +-
models/res_config_settings.py | 62 ++----
models/res_partner.py | 8 +-
models/scop_contribution.py | 71 -------
models/scop_cotisation.py | 116 ++++++-----
models/scop_cotisation_task.py | 25 ---
report/__init__.py | 1 +
report/account_invoice_all.py | 14 ++
report/scop_contribution_report.py | 195 ++++++++++++-------
report/scop_contribution_report.xml | 106 ++++++----
security/ir.model.access.csv | 2 +-
static/description/icon.png | Bin 9161 -> 15890 bytes
static/src/xml/account_payment.xml | 14 +-
views/account_invoice.xml | 150 --------------
views/account_move.xml | 258 +++++++++++++++++++++++--
views/account_payment_line.xml | 47 +++--
views/account_payment_order.xml | 100 +++++++---
views/res_config_settings.xml | 33 ++--
views/res_partner.xml | 36 ++--
views/scop_cotisation_task.xml | 40 ----
wizard/__init__.py | 2 +-
wizard/account_invoice_refund.py | 26 ---
wizard/account_move_reversal.py | 28 +++
42 files changed, 1554 insertions(+), 832 deletions(-)
create mode 100644 .editorconfig
create mode 100644 .eslintrc.yml
create mode 100644 .flake8
create mode 100644 .isort.cfg
create mode 100644 .pre-commit-config.yaml
create mode 100644 .prettierrc.yml
create mode 100644 .pylintrc
create mode 100644 .pylintrc-mandatory
mode change 100755 => 100644 README.rst
mode change 100755 => 100644 __init__.py
mode change 100755 => 100644 __manifest__.py
create mode 100644 migration/14.0.1.0.0/post-migration.py
create mode 100644 migration/14.0.1.0.0/pre-migration.py
mode change 100755 => 100644 models/__init__.py
delete mode 100755 models/account_invoice.py
create mode 100644 models/account_move.py
delete mode 100644 models/scop_contribution.py
delete mode 100644 models/scop_cotisation_task.py
mode change 100755 => 100644 report/__init__.py
create mode 100644 report/account_invoice_all.py
mode change 100755 => 100644 security/ir.model.access.csv
mode change 100755 => 100644 static/description/icon.png
delete mode 100644 views/account_invoice.xml
delete mode 100644 views/scop_cotisation_task.xml
delete mode 100644 wizard/account_invoice_refund.py
create mode 100644 wizard/account_move_reversal.py
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..bfd7ac5
--- /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 0000000..d4cc423
--- /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 0000000..e397e8e
--- /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
index b0e1bbe..818770f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,75 @@
-.*
-*.pyc
-!.gitignore
\ No newline at end of file
+# 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 0000000..0ec187e
--- /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 0000000..8a5999a
--- /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 0000000..5b6d4b3
--- /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 0000000..dc6270e
--- /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 0000000..43ea239
--- /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
index a453b4b..2696bfc
--- a/__init__.py
+++ b/__init__.py
@@ -1,11 +1,10 @@
# © 2022 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from . import models
-from . import report
-from . import wizard
+from odoo import SUPERUSER_ID, api
+
+from . import models, report, wizard
-from odoo import api, SUPERUSER_ID
def _configure_journals(cr, registry):
"""Setting journal and property field (if needed)"""
@@ -13,19 +12,29 @@ def _configure_journals(cr, registry):
env = api.Environment(cr, SUPERUSER_ID, {})
# if we already have a coa installed, create journal and set property field
- company_ids = env['res.company'].search([('chart_template_id', '!=', False)])
+ company_ids = env["res.company"].search([("chart_template_id", "!=", False)])
for company_id in company_ids:
- journal_id = env['account.journal'].search([
- ('name', '=', 'Cotisations'),
- ('company_id', '=', company_id.id),
- ('type', '=', 'sale')], limit=1).id
+ journal_id = (
+ env["account.journal"]
+ .search(
+ [
+ ("name", "=", "Cotisations"),
+ ("company_id", "=", company_id.id),
+ ("type", "=", "sale"),
+ ],
+ limit=1,
+ )
+ .id
+ )
if not journal_id:
- env['account.journal'].create({
- 'name': 'Cotisations',
- 'type': 'sale',
- 'code': 'COT',
- 'company_id': company_id.id,
- 'show_on_dashboard': False,
- 'sequence': 6,
- })
+ env["account.journal"].create(
+ {
+ "name": "Cotisations",
+ "type": "sale",
+ "code": "COT",
+ "company_id": company_id.id,
+ "show_on_dashboard": False,
+ "sequence": 6,
+ }
+ )
diff --git a/__manifest__.py b/__manifest__.py
old mode 100755
new mode 100644
index 4ac1922..5e73bf3
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -3,8 +3,7 @@
{
"name": "CG SCOP - Cotisations",
"summary": "CG SCOP - Cotisations",
- "version": "12.0.1.1.0",
- "development_status": "Production/Stable",
+ "version": "14.0.1.0.0",
"author": "Le Filament",
"license": "AGPL-3",
"application": False,
@@ -12,23 +11,23 @@
"depends": [
"account",
"account_banking_sepa_direct_debit",
- "cgscop_liste_ministere",
+ "account_payment_order",
+ "cgscop_account",
+ "cgscop_liasse_fiscale",
"cgscop_partner",
- "multi_company_menu",
+ "lefilament_sales",
],
"data": [
"security/ir.model.access.csv",
- "views/account_invoice.xml",
"views/account_move.xml",
"views/account_payment_order.xml",
"views/account_payment_line.xml",
"views/res_config_settings.xml",
"views/res_partner.xml",
- "views/scop_cotisation_task.xml",
"report/scop_contribution_report.xml",
],
"qweb": [
"static/src/xml/*.xml",
],
- 'post_init_hook': '_configure_journals',
+ "post_init_hook": "_configure_journals",
}
diff --git a/migration/14.0.1.0.0/post-migration.py b/migration/14.0.1.0.0/post-migration.py
new file mode 100644
index 0000000..61f9c8c
--- /dev/null
+++ b/migration/14.0.1.0.0/post-migration.py
@@ -0,0 +1,23 @@
+# © 2022 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade # pylint: disable=W7936
+
+
+def scop_liasse_fiscale_map_values(env):
+ openupgrade.map_values(
+ env.cr,
+ openupgrade.get_legacy_name("year"),
+ "scop_cotisation",
+ [
+ (2020, "2020"),
+ (2021, "2021"),
+ (2022, "2022"),
+ ],
+ table="scop_cotisation",
+ )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+ scop_liasse_fiscale_map_values(env)
diff --git a/migration/14.0.1.0.0/pre-migration.py b/migration/14.0.1.0.0/pre-migration.py
new file mode 100644
index 0000000..e029ec3
--- /dev/null
+++ b/migration/14.0.1.0.0/pre-migration.py
@@ -0,0 +1,13 @@
+# © 2022 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+column_renames = {
+ "scop_cotisation": [("year", None)],
+}
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+ openupgrade.rename_columns(env.cr, column_renames)
diff --git a/models/__init__.py b/models/__init__.py
old mode 100755
new mode 100644
index 419d513..5c324d7
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -1,12 +1,10 @@
# © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from . import account_invoice
+from . import account_move
from . import account_payment_order
from . import chart_template
from . import res_company
from . import res_config_settings
from . import res_partner
-from . import scop_contribution
from . import scop_cotisation
-from . import scop_cotisation_task
diff --git a/models/account_invoice.py b/models/account_invoice.py
deleted file mode 100755
index 16c9033..0000000
--- a/models/account_invoice.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# © 2020 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from datetime import datetime
-import json
-
-from odoo import models, fields, api
-
-
-class ScopAccountInvoice(models.Model):
- _inherit = "account.invoice"
-
- @api.model
- def default_get(self, fields):
- """
- Attribue la valeur du journal des cotisations par défaut si la facture
- est de type 'is_contribution'
- Affecte le type 'is_contribution' par défaut si la facture est sur le
- journal des cotisations
- :param fields:
- :return:
- """
- res = super(ScopAccountInvoice, self).default_get(fields)
- if res.get('is_contribution'):
- res['journal_id'] =\
- self.env.user.company_id.contribution_journal_id.id
- else:
- if res.get('journal_id') == \
- self.env.user.company_id.contribution_journal_id.id:
- res['is_contribution'] = True
- return res
-
- liasse_fiscale_id = fields.Many2one(
- comodel_name='scop.liasse.fiscale',
- string='Liasse Fiscale')
- year = fields.Integer('Année de cotisation')
- is_contribution = fields.Boolean("Cotisation", default=False)
- type_contribution_id = fields.Many2one(
- comodel_name="scop.contribution.type",
- string="Type de cotisation",
- readonly=True)
- partner_ur_id = fields.Many2one(
- comodel_name='union.regionale',
- string='UR Adhérent',
- related='partner_id.ur_id',
- store=True
- )
- contribution_id = fields.Many2one(
- comodel_name='scop.contribution',
- string='Ligne de cotisation')
- is_sdd = fields.Boolean(
- 'Au prélèvement',
- compute='compute_is_sdd',
- search='_search_is_sdd')
-
- # ------------------------------------------------------
- # Computed field
- # ------------------------------------------------------
- @api.multi
- def compute_is_sdd(self):
- sdd_id = self.env.ref(
- 'account_banking_sepa_direct_debit.sepa_direct_debit').id
- for invoice in self:
- if invoice.payment_mode_id and invoice.payment_mode_id.payment_method_id.id == sdd_id:
- invoice.is_sdd = True
- else:
- invoice.is_sdd = False
-
- @api.multi
- def _search_is_sdd(self, operator, value):
- recs = self.search([]).filtered(lambda x: x.is_sdd is True)
- if recs:
- return [('id', 'in', [x.id for x in recs])]
-
- # ------------------------------------------------------
- # Override Parent
- # ------------------------------------------------------
- @api.one
- def _get_outstanding_info_JSON(self):
- super(ScopAccountInvoice, self)._get_outstanding_info_JSON()
- info = json.loads(self.outstanding_credits_debits_widget)
- if info:
- values = info.get('content', False)
- if self.state == 'open' and values:
- domain = [('account_id', '=', self.account_id.id),
- ('partner_id', '=',
- self.env['res.partner']._find_accounting_partner(
- self.partner_id).id),
- ('reconciled', '=', False),
- ('move_id.state', '=', 'posted'),
- '|',
- '&', ('amount_residual_currency', '!=', 0.0),
- ('currency_id', '!=', None),
- '&', ('amount_residual_currency', '=', 0.0), '&',
- ('currency_id', '=', None),
- ('amount_residual', '!=', 0.0)]
- if self.type in ('out_invoice', 'in_refund'):
- domain.extend([('credit', '>', 0), ('debit', '=', 0)])
- else:
- domain.extend([('credit', '=', 0), ('debit', '>', 0)])
- lines = self.env['account.move.line'].search(domain)
- for value in values:
- for line in lines:
- if value.get('id') == line.id:
- value.update({
- 'date_maturity': datetime.strftime(line.date_maturity, "%d/%m/%Y"),
- 'invoice': line.invoice_id.number
- })
- self.outstanding_credits_debits_widget = json.dumps(info)
diff --git a/models/account_move.py b/models/account_move.py
new file mode 100644
index 0000000..ffc5802
--- /dev/null
+++ b/models/account_move.py
@@ -0,0 +1,125 @@
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import api, fields, models
+
+
+class ScopAccountMove(models.Model):
+ _inherit = "account.move"
+
+ @api.model
+ def default_get(self, fields):
+ """
+ Attribue la valeur du journal des cotisations par défaut si la facture
+ est de type 'is_contribution'
+ Affecte le type 'is_contribution' par défaut si la facture est sur le
+ journal des cotisations
+ :param fields:
+ :return:
+ """
+ res = super(ScopAccountMove, self).default_get(fields)
+ if res.get("is_contribution"):
+ res["journal_id"] = self.env.user.company_id.contribution_journal_id.id
+ else:
+ if (
+ res.get("journal_id")
+ == self.env.user.company_id.contribution_journal_id.id
+ ):
+ res["is_contribution"] = True
+ return res
+
+ liasse_fiscale_id = fields.Many2one(
+ comodel_name="scop.liasse.fiscale", string="Liasse Fiscale"
+ )
+ year = fields.Integer("Année de cotisation")
+ is_contribution = fields.Boolean("Cotisation", default=False)
+ type_contribution_id = fields.Many2one(
+ comodel_name="scop.contribution.type",
+ string="Type de cotisation",
+ readonly=True,
+ )
+ partner_ur_id = fields.Many2one(
+ comodel_name="union.regionale",
+ string="UR Adhérent",
+ related="partner_id.ur_id",
+ store=True,
+ )
+ partner_member_number = fields.Char(
+ string="N° Adhérent",
+ related="partner_id.member_number",
+ )
+ contribution_id = fields.Many2one(
+ comodel_name="scop.contribution", string="Ligne de cotisation"
+ )
+ is_sdd = fields.Boolean(
+ "Au prélèvement", compute="_compute_is_sdd", search="_search_is_sdd"
+ )
+
+ # ------------------------------------------------------
+ # Computed field
+ # ------------------------------------------------------
+ def _compute_is_sdd(self):
+ sdd_id = self.env.ref("account_banking_sepa_direct_debit.sepa_direct_debit").id
+ for invoice in self:
+ if (
+ invoice.payment_mode_id
+ and invoice.payment_mode_id.payment_method_id.id == sdd_id
+ ):
+ invoice.is_sdd = True
+ else:
+ invoice.is_sdd = False
+
+ def _search_is_sdd(self, operator, value):
+ recs = self.search([]).filtered(lambda x: x.is_sdd is True)
+ if recs:
+ return [("id", "in", [x.id for x in recs])]
+
+ # ------------------------------------------------------
+ # Override Parent
+ # ------------------------------------------------------
+ # TODO: check if necessary
+ # def _get_outstanding_info_JSON(self):
+ # super(ScopAccountMove, self)._get_outstanding_info_JSON()
+ # info = json.loads(self.outstanding_credits_debits_widget)
+ # if info:
+ # values = info.get("content", False)
+ # if self.state == "open" and values:
+ # domain = [
+ # ("account_id", "=", self.account_id.id),
+ # (
+ # "partner_id",
+ # "=",
+ # self.env["res.partner"]
+ # ._find_accounting_partner(self.partner_id)
+ # .id,
+ # ),
+ # ("reconciled", "=", False),
+ # ("move_id.state", "=", "posted"),
+ # "|",
+ # "&",
+ # ("amount_residual_currency", "!=", 0.0),
+ # ("currency_id", "!=", None),
+ # "&",
+ # ("amount_residual_currency", "=", 0.0),
+ # "&",
+ # ("currency_id", "=", None),
+ # ("amount_residual", "!=", 0.0),
+ # ]
+ # if self.type in ("out_invoice", "in_refund"):
+ # domain.extend([("credit", ">", 0), ("debit", "=", 0)])
+ # else:
+ # domain.extend([("credit", "=", 0), ("debit", ">", 0)])
+ # lines = self.env["account.move.line"].search(domain)
+ # for value in values:
+ # for line in lines:
+ # if value.get("id") == line.id:
+ # value.update(
+ # {
+ # "date_maturity": datetime.strftime(
+ # line.date_maturity, "%d/%m/%Y"
+ # ),
+ # "invoice": line.invoice_id.number,
+ # }
+ # )
+ # self.outstanding_credits_debits_widget = json.dumps(info)
diff --git a/models/account_payment_order.py b/models/account_payment_order.py
index c4685cd..846d3bc 100644
--- a/models/account_payment_order.py
+++ b/models/account_payment_order.py
@@ -1,97 +1,92 @@
# 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
from odoo.exceptions import ValidationError
class AccountPaymentOrder(models.Model):
- _inherit = 'account.payment.order'
+ _inherit = "account.payment.order"
payment_line_amount = fields.Float(
- string='Total Opérations',
- compute='_compute_payment_line_amount'
+ string="Total Opérations", compute="_compute_payment_line_amount"
)
bank_line_amount = fields.Float(
- string='Total Lignes de paiement',
- compute='_compute_bank_line_amount'
+ string="Total Lignes de paiement", compute="_compute_bank_line_amount"
)
attachment_ids = fields.One2many(
- comodel_name='ir.attachment',
- compute='_compute_attachment_ids'
+ comodel_name="ir.attachment", compute="_compute_attachment_ids"
)
# ------------------------------------------------------
# Compute fields
# ------------------------------------------------------
- @api.multi
def _compute_payment_line_amount(self):
for po in self:
- po.payment_line_amount = sum(
- po.payment_line_ids.mapped('amount_currency')
- )
+ po.payment_line_amount = sum(po.payment_line_ids.mapped("amount_currency"))
- @api.multi
def _compute_bank_line_amount(self):
for po in self:
- po.bank_line_amount = sum(
- po.bank_line_ids.mapped('amount_currency')
- )
+ po.bank_line_amount = sum(po.bank_line_ids.mapped("amount_currency"))
- @api.multi
def _compute_attachment_ids(self):
- Attachment = self.env['ir.attachment']
+ Attachment = self.env["ir.attachment"]
for po in self:
- po.attachment_ids = Attachment.search([
- ('res_model', '=', 'account.payment.order'),
- ('res_id', '=', po.id)
- ])
+ po.attachment_ids = Attachment.search(
+ [
+ ("res_model", "=", "account.payment.order"),
+ ("res_id", "=", po.id),
+ ]
+ )
# ------------------------------------------------------
# Button function
# ------------------------------------------------------
def view_payment_line(self):
- tree_id = self.env.ref(
- 'cgscop_cotisation.scop_account_payment_line_tree').id
+ tree_id = self.env.ref("cgscop_cotisation.scop_account_payment_line_tree").id
search_id = self.env.ref(
- 'cgscop_cotisation.scop_account_payment_line_search').id
+ "cgscop_cotisation.scop_account_payment_line_search"
+ ).id
return {
- 'type': 'ir.actions.act_window',
- 'name': "Lignes d'opérations",
- 'res_model': 'account.payment.line',
- 'views': [[tree_id, 'tree']],
- 'search_view_id': [search_id, 'search'],
- 'domain': [['order_id', '=', self.id]],
+ "type": "ir.actions.act_window",
+ "name": "Lignes d'opérations",
+ "res_model": "account.payment.line",
+ "views": [[tree_id, "tree"]],
+ "search_view_id": [search_id, "search"],
+ "domain": [["order_id", "=", self.id]],
}
def view_account_move(self):
- tree_id = self.env.ref(
- 'cgscop_cotisation.scop_account_move_tree').id
- search_id = self.env.ref(
- 'cgscop_cotisation.scop_account_move_search').id
+ tree_id = self.env.ref("cgscop_cotisation.scop_account_move_tree").id
+ search_id = self.env.ref("cgscop_cotisation.scop_account_move_search").id
return {
- 'type': 'ir.actions.act_window',
- 'name': "Pièces comptables de l'ordre de prélèvement",
- 'res_model': 'account.move',
- 'views': [[tree_id, 'tree'], [False, 'form']],
- 'search_view_id': [search_id, 'search'],
- 'domain': [['payment_order_id', '=', self.id]],
+ "type": "ir.actions.act_window",
+ "name": "Pièces comptables de l'ordre de prélèvement",
+ "res_model": "account.move",
+ "views": [[tree_id, "tree"], [False, "form"]],
+ "search_view_id": [search_id, "search"],
+ "domain": [["payment_order_id", "=", self.id]],
}
# ------------------------------------------------------
# Common function
# ------------------------------------------------------
- @api.multi
def check_sepa_order(self):
for order in self:
if not order.sepa:
- msg = "Les comptes bancaires des coopératives suivantes ne sont pas corrects : \n"
- payment_line_ids = order.payment_line_ids.mapped('partner_bank_id')
- account_ids = payment_line_ids.filtered(lambda a: a.acc_type != 'iban')
+ msg = (
+ "Les comptes bancaires des coopératives "
+ "suivantes ne sont pas corrects : \n"
+ )
+ payment_line_ids = order.payment_line_ids.mapped("partner_bank_id")
+ account_ids = payment_line_ids.filtered(lambda a: a.acc_type != "iban")
for acc in account_ids:
- msg += ' - ' + acc.partner_id.name + " - " + acc.acc_number + "\n"
+ msg += " - " + acc.partner_id.name + " - " + acc.acc_number + "\n"
- msg += "\nVeuillez corriger ces comptes bancaires pour pouvoir valider l'ordre de prélèvement."
+ msg += (
+ "\nVeuillez corriger ces comptes bancaires pour "
+ "pouvoir valider l'ordre de prélèvement."
+ )
raise ValidationError(msg)
else:
return True
@@ -99,7 +94,6 @@ class AccountPaymentOrder(models.Model):
# ------------------------------------------------------
# Override Parent
# ------------------------------------------------------
- @api.multi
def open2generated(self):
self.check_sepa_order()
- return super(AccountPaymentOrder, self).open2generated()
\ No newline at end of file
+ return super(AccountPaymentOrder, self).open2generated()
diff --git a/models/chart_template.py b/models/chart_template.py
index 3173259..c0a86c0 100644
--- a/models/chart_template.py
+++ b/models/chart_template.py
@@ -9,13 +9,17 @@ class CotisationChartTemplate(models.Model):
@api.model
def generate_journals(self, acc_template_ref, company, journals_dict=None):
- journal_to_add = [{
- 'name': 'Cotisation',
- 'type': 'sale',
- 'code': 'COT',
- 'favorite': False,
- 'sequence': 6}]
+ journal_to_add = [
+ {
+ "name": "Cotisation",
+ "type": "sale",
+ "code": "COT",
+ "favorite": False,
+ "sequence": 6,
+ }
+ ]
return super(CotisationChartTemplate, self).generate_journals(
acc_template_ref=acc_template_ref,
company=company,
- journals_dict=journal_to_add)
+ journals_dict=journal_to_add,
+ )
diff --git a/models/res_company.py b/models/res_company.py
index 96f63c0..344c421 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -5,17 +5,17 @@ from odoo import fields, models
class ScopCotisationCompany(models.Model):
- _inherit = 'res.company'
+ _inherit = "res.company"
- is_contribution = fields.Boolean('Cotisations', default=False)
+ is_contribution = fields.Boolean("Cotisations", default=False)
contribution_journal_id = fields.Many2one(
- comodel_name='account.journal',
- string='Journal des cotisations',
- domain="[('type', '=', 'sale')]"
+ comodel_name="account.journal",
+ string="Journal des cotisations",
+ domain="[('type', '=', 'sale')]",
)
tag_cotiz_id = fields.Many2one(
- comodel_name='res.partner.category',
- string='Etiquette de cotisation',
- ondelete='restrict'
+ comodel_name="res.partner.category",
+ string="Etiquette de cotisation",
+ ondelete="restrict",
)
diff --git a/models/res_config_settings.py b/models/res_config_settings.py
index 61cb183..5334e2a 100644
--- a/models/res_config_settings.py
+++ b/models/res_config_settings.py
@@ -5,64 +5,24 @@ from odoo import fields, models
class CotisationsConfigSettings(models.TransientModel):
- _inherit = 'res.config.settings'
+ _inherit = "res.config.settings"
is_contribution = fields.Boolean(
- string='Cotisations',
+ string="Cotisations",
related="company_id.is_contribution",
- readonly=False)
+ readonly=False,
+ )
contribution_journal_id = fields.Many2one(
- comodel_name='account.journal',
+ comodel_name="account.journal",
related="company_id.contribution_journal_id",
readonly=False,
- string='Journal des cotisations',
- domain="[('type', '=', 'sale')]")
+ string="Journal des cotisations",
+ domain="[('type', '=', 'sale')]",
+ )
tag_cotiz_id = fields.Many2one(
- comodel_name='res.partner.category',
+ comodel_name="res.partner.category",
related="company_id.tag_cotiz_id",
readonly=False,
- string='Etiquette de cotisation')
-
- # ------------------------------------------------------
- # Actions
- # ------------------------------------------------------
- def add_company_to_menu(self, menu, bool_condition):
- """
- Add current company to the list of companies allowed to see menu
- :param menu: target menu
- :param bool_condition: condition to check to allow company or not
- :return: add company to menu
- """
- current_company_id = self.env.user.company_id
- if bool_condition:
- if current_company_id not in menu.company_ids:
- menu.write({
- "company_ids": [(4, current_company_id.id)]
- })
- else:
- if current_company_id in menu.company_ids:
- menu.write({
- "company_ids": [(3, current_company_id.id)]
- })
-
- # ------------------------------------------------------
- # Override Parent
- # ------------------------------------------------------
- def execute(self):
- """
- Rewrite execute() function to add current company to the list
- of available company in ir_ui_menu
- """
- res = super(CotisationsConfigSettings, self).execute()
-
- menu_cotiz = self.env.ref(
- 'cgscop_cotisation.menu_scop_cotisation')
- menu_cotiz_task_create = self.env.ref(
- 'cgscop_cotisation.menu_scop_cotisation_list_task')
-
- bool_condition = self.is_contribution
-
- self.add_company_to_menu(menu_cotiz, bool_condition)
- self.add_company_to_menu(menu_cotiz_task_create, bool_condition)
- return res
+ string="Etiquette de cotisation",
+ )
diff --git a/models/res_partner.py b/models/res_partner.py
index 67c5ab6..13d0939 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -5,10 +5,10 @@ from odoo import fields, models
class ResPartner(models.Model):
- _inherit = 'res.partner'
+ _inherit = "res.partner"
contribution_report_ids = fields.One2many(
- comodel_name='scop.contribution.report',
- inverse_name='partner_id',
- string='Cotisations',
+ comodel_name="scop.contribution.report",
+ inverse_name="partner_id",
+ string="Cotisations",
)
diff --git a/models/scop_contribution.py b/models/scop_contribution.py
deleted file mode 100644
index 0368697..0000000
--- a/models/scop_contribution.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# © 2020 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import models, fields, api
-
-
-class ScopContributions(models.Model):
- _inherit = "scop.contribution"
-
- # TODO: remove after migration
- invoice_id = fields.Many2one(
- comodel_name='account.invoice',
- string='Facture liée',
- ondelete='cascade')
- invoice_ids = fields.One2many(
- comodel_name='account.invoice',
- inverse_name='contribution_id',
- string='Factures liées')
- amount_paid = fields.Float(
- compute='_compute_amount_paid', store=True)
- amount_remaining = fields.Float(
- compute='_compute_amount_remaining', store=True, readonly=False)
- is_exempt = fields.Boolean(
- string='Exonération',
- compute='_compute_is_exempt',
- default=False
- )
-
- @api.depends('amount_remaining')
- @api.multi
- def _compute_amount_paid(self):
- for r in self:
- r.amount_paid = r.amount_called - r.amount_remaining
-
- @api.depends('invoice_ids', 'invoice_ids.residual_signed')
- @api.multi
- def _compute_amount_remaining(self):
- for r in self:
- r.amount_remaining = sum(
- r.invoice_ids.mapped('residual_signed'))
-
- @api.multi
- def _compute_is_exempt(self):
- for contrib in self:
- if contrib.invoice_id:
- is_refund = contrib.invoice_id.search([
- ('refund_invoice_id', '=', contrib.invoice_id.id),
- ('state', 'in', ['open', 'paid'])])
- if is_refund:
- contrib.is_exempt = True
- else:
- contrib.is_exempt = False
- else:
- contrib.is_exempt = False
-
- def view_refund(self):
- tree_id = self.env.ref(
- 'cgscop_cotisation.invoice_scop_contribution_refund_tree').id
- refund_ids = self.invoice_id.search([
- ('refund_invoice_id', '=', self.invoice_id.id),
- ('state', 'in', ['open', 'paid'])
- ])
- return {
- 'type': 'ir.actions.act_window',
- 'name': 'Exonérations',
- 'res_model': 'account.invoice',
- 'views': [[tree_id, 'tree']],
- 'target': 'new',
- 'domain': [['id', 'in', refund_ids.ids]],
- 'flags': {'action_buttons': False}
- }
diff --git a/models/scop_cotisation.py b/models/scop_cotisation.py
index 37f9bb0..731eebd 100644
--- a/models/scop_cotisation.py
+++ b/models/scop_cotisation.py
@@ -1,95 +1,118 @@
# © 2021 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import models, fields, api
-
from datetime import date
+from odoo import fields, models
+
class ScopCotisation(models.AbstractModel):
_name = "scop.cotisation"
_description = "Base des cotisations"
year = fields.Selection(
- [(year, str(year)) for year in range(
- fields.Datetime.now().year - 1, fields.Datetime.now().year + 2)],
- string='Année de cotisation',
- required=True)
+ [
+ (str(year), str(year))
+ for year in range(
+ fields.Datetime.now().year - 1, fields.Datetime.now().year + 2
+ )
+ ],
+ string="Année de cotisation",
+ required=True,
+ )
company_id = fields.Many2one(
- comodel_name='res.company',
- string='Company', change_default=True,
- required=True, readonly=True,
- default=lambda self: self.env.user.company_id)
+ comodel_name="res.company",
+ string="Company",
+ change_default=True,
+ required=True,
+ readonly=True,
+ default=lambda self: self.env.user.company_id,
+ )
company_currency_id = fields.Many2one(
- comodel_name='res.currency', related='company_id.currency_id',
- string="Company Currency", readonly=True)
+ comodel_name="res.currency",
+ related="company_id.currency_id",
+ string="Company Currency",
+ readonly=True,
+ )
date_cotisation = fields.Date(
string="Date calcul cotisation",
- help="Date de calcul qui apparaitra sur le bordereau de cotisation"
+ help="Date de calcul qui apparaitra sur le bordereau de cotisation",
)
member_count = fields.Integer(
- "Adhérents renouvelés",
- compute='_compute_member_count')
+ "Adhérents renouvelés", compute="_compute_member_count"
+ )
new_member_count = fields.Integer(
- "Nouveaux adhérents",
- compute='_compute_new_member_count')
+ "Nouveaux adhérents", compute="_compute_new_member_count"
+ )
invoiced_member_count = fields.Integer(
- "Cotisations créées",
- compute='_compute_invoiced_member_count')
- trimester_1 = fields.Date('1er Trimestre')
- trimester_2 = fields.Date('2ème Trimestre')
- trimester_3 = fields.Date('3ème Trimestre')
- trimester_4 = fields.Date('4ème Trimestre')
+ "Cotisations créées", compute="_compute_invoiced_member_count"
+ )
+ trimester_1 = fields.Date("1er Trimestre")
+ trimester_2 = fields.Date("2ème Trimestre")
+ trimester_3 = fields.Date("3ème Trimestre")
+ trimester_4 = fields.Date("4ème Trimestre")
# ------------------------------------------------------
# Compute fields
# ------------------------------------------------------
- @api.multi
def _compute_member_count(self):
for cotiz in self:
cotiz.member_count = len(cotiz.get_members())
- @api.multi
def _compute_new_member_count(self):
for cotiz in self:
cotiz.new_member_count = len(cotiz.get_new_members())
- @api.multi
def _compute_invoiced_member_count(self):
for cotiz in self:
- cotiz.invoiced_member_count = len(
- cotiz.invoice_ids.mapped('partner_id'))
+ cotiz.invoiced_member_count = len(cotiz.invoice_ids.mapped("partner_id"))
# ------------------------------------------------------
# Global functions
# ------------------------------------------------------
- @api.multi
def get_members(self):
self.ensure_one()
- members = self.env['scop.membership.period'].search([
- ('type_id', '=', self.env.ref(
- 'cgscop_partner.membership_type_1').id),
- ('start', '<', date(self.year, 1, 1)),
- ('end', '=', None),
- ]).mapped('partner_id')
+ members = (
+ self.env["scop.membership.period"]
+ .search(
+ [
+ (
+ "type_id",
+ "=",
+ self.env.ref("cgscop_partner.membership_type_1").id,
+ ),
+ ("start", "<", date(self.year, 1, 1)),
+ ("end", "=", None),
+ ]
+ )
+ .mapped("partner_id")
+ )
return members
- @api.multi
def get_new_members(self, limit_start_date=None):
if not limit_start_date:
limit_start_date = date(self.year, 12, 31)
self.ensure_one()
- members = self.env['scop.membership.period'].search([
- ('type_id', '=', self.env.ref(
- 'cgscop_partner.membership_type_1').id),
- ('start', '>=', date(self.year, 1, 1)),
- ('start', '<=', limit_start_date),
- '|',
- ('end', '=', None),
- ('end', '>', date(self.year, 1, 1))
- ]).mapped('partner_id')
+ members = (
+ self.env["scop.membership.period"]
+ .search(
+ [
+ (
+ "type_id",
+ "=",
+ self.env.ref("cgscop_partner.membership_type_1").id,
+ ),
+ ("start", ">=", date(self.year, 1, 1)),
+ ("start", "<=", limit_start_date),
+ "|",
+ ("end", "=", None),
+ ("end", ">", date(self.year, 1, 1)),
+ ]
+ )
+ .mapped("partner_id")
+ )
return members
def round_to_closest_multiple(self, float_to_round, multiple):
@@ -102,8 +125,7 @@ class ScopCotisation(models.AbstractModel):
large_multiple = small_multiple + multiple
# Return the closest of two
- if abs(float_to_round - small_multiple) < \
- abs(float_to_round - large_multiple):
+ if abs(float_to_round - small_multiple) < abs(float_to_round - large_multiple):
return small_multiple
else:
return large_multiple
diff --git a/models/scop_cotisation_task.py b/models/scop_cotisation_task.py
deleted file mode 100644
index c88a503..0000000
--- a/models/scop_cotisation_task.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# © 2021 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import fields, models
-
-
-class CotisationTask(models.Model):
- _name = 'scop.cotisation.task'
- _description = 'Gestion des créations des cotisations'
-
- year = fields.Integer('Année')
- message = fields.Char("Message")
- cotiz_created = fields.Integer("Appels de cotisation / Bordereaux créés")
- cotiz_to_create = fields.Integer(
- "Appels de cotisation / Bordereaux à créer")
- is_error = fields.Boolean('En erreur', default=False)
- status = fields.Selection([
- ('in_process', 'En cours'),
- ('done', 'Terminé')
- ], string='Statut')
- company_id = fields.Many2one(
- comodel_name='res.company',
- string='Company', change_default=True,
- required=True, readonly=True,
- default=lambda self: self.env.user.company_id)
diff --git a/report/__init__.py b/report/__init__.py
old mode 100755
new mode 100644
index 530b049..df1634d
--- a/report/__init__.py
+++ b/report/__init__.py
@@ -1,4 +1,5 @@
# © 2020 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import account_invoice_all
from . import scop_contribution_report
diff --git a/report/account_invoice_all.py b/report/account_invoice_all.py
new file mode 100644
index 0000000..13c06b6
--- /dev/null
+++ b/report/account_invoice_all.py
@@ -0,0 +1,14 @@
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+from odoo import models
+
+
+class AccountInvoiceReport(models.Model):
+ _inherit = "account.invoice.all"
+
+ def _subquery(self):
+ query = super()._subquery()
+ query = query + " AND is_contribution is false"
+ return query
diff --git a/report/scop_contribution_report.py b/report/scop_contribution_report.py
index bb8cdbd..ab23b67 100644
--- a/report/scop_contribution_report.py
+++ b/report/scop_contribution_report.py
@@ -1,39 +1,48 @@
# © 2022 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import tools
-from odoo import models, fields, api
+from psycopg2.extensions import AsIs
+
+from odoo import api, fields, models, tools
class ScopContributionReport(models.Model):
_name = "scop.contribution.report"
_description = "Vue cotisations"
_auto = False
- _order = 'year desc, partner_id'
+ _order = "year desc, partner_id"
- name = fields.Char(compute='_compute_name')
- year = fields.Char('Année de cotisation')
+ name = fields.Char(compute="_compute_name")
+ year = fields.Char("Année de cotisation")
source = fields.Selection(
- string='Source',
- selection=[('odoo', 'Odoo')],
- required=True,)
+ string="Source",
+ selection=[("odoo", "Odoo")],
+ required=True,
+ )
type_contribution_id = fields.Many2one(
comodel_name="scop.contribution.type",
string="Type de cotisation",
- readonly=True)
- partner_id = fields.Many2one('res.partner', string='Partner', readonly=True)
- amount_called = fields.Float('Montant Appelé')
- amount_paid = fields.Float('Montant Payé')
- amount_due = fields.Float('Montant Restant')
- is_loss = fields.Boolean('Exonération/Perte', compute="_compute_is_loss")
- payments = fields.Html('Paiements', compute="_compute_payments")
+ readonly=True,
+ )
+ partner_id = fields.Many2one("res.partner", string="Partner", readonly=True)
+ amount_called = fields.Float("Montant Appelé")
+ amount_paid = fields.Float("Montant Payé")
+ amount_due = fields.Float("Montant Restant")
+ is_loss = fields.Boolean("Exonération/Perte", compute="_compute_is_loss")
+ payments = fields.Html("Paiements", compute="_compute_payments")
_depends = {
- 'account.invoice': [
- 'year', 'type_contribution_id', 'partner_id',
- 'amount_total_signed', 'residual_company_signed',
- 'state', 'type', 'is_contribution', 'refund_invoice_id'
+ "account.move": [
+ "year",
+ "type_contribution_id",
+ "partner_id",
+ "amount_total_signed",
+ "amount_residual_signed",
+ "state",
+ "move_type",
+ "is_contribution",
+ "payment_state",
],
}
@@ -48,23 +57,24 @@ class ScopContributionReport(models.Model):
i.type_contribution_id,
i.partner_id,
SUM(i.amount_total_signed) AS amount_called,
- SUM(i.amount_total_signed - i.residual_company_signed) AS amount_paid,
- SUM(i.residual_company_signed) AS amount_due
+ SUM(i.amount_total_signed - i.amount_residual_signed) AS amount_paid,
+ SUM(i.amount_residual_signed) AS amount_due
"""
return select_str
def _from_invoice(self):
from_str = """
FROM
- account_invoice i
+ account_move i
"""
return from_str
def _where_invoice(self):
where_str = """
WHERE
- i.state in ('open', 'paid', 'in_payment') AND
- i.is_contribution = true
+ i.state = 'posted'
+ AND i.move_type in ('out_invoice', 'out_refund')
+ AND i.is_contribution = true
"""
return where_str
@@ -79,8 +89,11 @@ class ScopContributionReport(models.Model):
def _query_invoice(self):
query = "(%s %s %s %s)" % (
- self._select_invoice(), self._from_invoice(),
- self._where_invoice(), self._groupby_invoice())
+ self._select_invoice(),
+ self._from_invoice(),
+ self._where_invoice(),
+ self._groupby_invoice(),
+ )
return query
def _subquery(self):
@@ -118,35 +131,39 @@ class ScopContributionReport(models.Model):
def _query(self):
query = (
- self._select() + self._subquery() + ') c ' +
- self._query_groupby() + self._query_order()
+ self._select()
+ + self._subquery()
+ + ") c "
+ + self._query_groupby()
+ + self._query_order()
)
return query
- @api.model_cr
+ @api.model
def init(self):
tools.drop_view_if_exists(self.env.cr, self._table)
- self.env.cr.execute("""CREATE or REPLACE VIEW %s as (
- %s
- )""" % (
- self._table, self._query()))
+ self.env.cr.execute(
+ "CREATE or REPLACE VIEW %s as (%s)",
+ (AsIs(self._table), AsIs(self._query())),
+ )
# ------------------------------------------------------
# Computed fields
# ------------------------------------------------------
- @api.multi
def _compute_is_loss(self):
for contribution in self:
contribution.is_loss = contribution._get_is_loss()
- @api.multi
def _compute_name(self):
for contribution in self:
- contribution.name = (contribution.year + ' - ' +
- contribution.type_contribution_id.name +
- ' - ' + contribution.partner_id.name)
+ contribution.name = (
+ contribution.year
+ + " - "
+ + contribution.type_contribution_id.name
+ + " - "
+ + contribution.partner_id.name
+ )
- @api.multi
def _compute_payments(self):
for contribution in self:
contribution.payments = contribution._get_payment()
@@ -155,12 +172,22 @@ class ScopContributionReport(models.Model):
# Business functions
# ------------------------------------------------------
def _get_is_loss(self):
- invoice_ids = self.env['account.invoice'].sudo().search([
- ('year', '=', int(self.year)),
- ('partner_id', '=', self.partner_id.id),
- ('type_contribution_id', '=', self.type_contribution_id.id),
- ])
- refund_ids = invoice_ids.filtered(lambda i: i.type == 'out_refund')
+ invoice_ids = (
+ self.env["account.move"]
+ .sudo()
+ .search(
+ [
+ ("year", "=", int(self.year)),
+ ("partner_id", "=", self.partner_id.id),
+ (
+ "type_contribution_id",
+ "=",
+ self.type_contribution_id.id,
+ ),
+ ]
+ )
+ )
+ refund_ids = invoice_ids.filtered(lambda i: i.move_type == "out_refund")
if refund_ids:
return True
else:
@@ -169,38 +196,55 @@ class ScopContributionReport(models.Model):
def _get_payment(self):
self.ensure_one()
payments_html = False
- if self.source == 'odoo':
+ if self.source == "odoo":
invoice_ids = self.get_invoice_contribution()
- payment_ids = invoice_ids.mapped('payment_move_line_ids')
+ # TODO: trouver le nouveau champ payment_move_line_ids
+ payment_ids = invoice_ids.mapped("payment_move_line_ids")
if payment_ids:
- payments = payment_ids.mapped(lambda p: {
- 'date': p.date,
- 'name': p.name,
- 'ref': p.ref,
- 'credit': p.credit,
- 'class': ''
- } if not p.invoice_id else {
- 'date': p.date,
- 'name': p.name,
- 'ref': '',
- 'credit': p.credit,
- 'class': 'text-danger'
- })
+ payments = payment_ids.mapped(
+ lambda p: {
+ "date": p.date,
+ "name": p.name,
+ "ref": p.ref,
+ "credit": p.credit,
+ "class": "",
+ }
+ if not p.invoice_id
+ else {
+ "date": p.date,
+ "name": p.name,
+ "ref": "",
+ "credit": p.credit,
+ "class": "text-danger",
+ }
+ )
payments_html = self._get_html_table(payments)
if not payments_html:
- payments_html = "<p>Il n'y a pas de paiements associés à cette cotisation</p>"
+ payments_html = (
+ "<p>Il n'y a pas de paiements associés à cette cotisation</p>"
+ )
return payments_html
def get_invoice_contribution(self):
- invoice_ids = self.env['account.invoice'].sudo().search([
- ('year', '=', int(self.year)),
- ('partner_id', '=', self.partner_id.id),
- ('type_contribution_id', '=', self.type_contribution_id.id),
- ('type', '=', 'out_invoice'),
- '|',
- ('bordereau_id.state', 'not in', ('cancel',)),
- ('bordereau_id', '=', False)
- ])
+ invoice_ids = (
+ self.env["account.move"]
+ .sudo()
+ .search(
+ [
+ ("year", "=", int(self.year)),
+ ("partner_id", "=", self.partner_id.id),
+ (
+ "type_contribution_id",
+ "=",
+ self.type_contribution_id.id,
+ ),
+ ("type", "=", "out_invoice"),
+ "|",
+ ("bordereau_id.state", "not in", ("cancel",)),
+ ("bordereau_id", "=", False),
+ ]
+ )
+ )
return invoice_ids
def _get_html_table(self, payments):
@@ -227,10 +271,13 @@ class ScopContributionReport(models.Model):
<td>%s</td>
<td class='text-right'>%.2f €</td>
</tr>
- """ % (payment.get('class', ''),
- payment.get('date', '').strftime('%d/%m/%Y'),
- payment.get('name', ''), payment.get('ref', ''),
- payment.get('credit', 0.0),)
+ """ % (
+ payment.get("class", ""),
+ payment.get("date", "").strftime("%d/%m/%Y"),
+ payment.get("name", ""),
+ payment.get("ref", ""),
+ payment.get("credit", 0.0),
+ )
end_html = "</tbody></table>"
return start_html + content_html + end_html
diff --git a/report/scop_contribution_report.xml b/report/scop_contribution_report.xml
index 6b7fbd7..bb7b8e3 100644
--- a/report/scop_contribution_report.xml
+++ b/report/scop_contribution_report.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<!-- SEARCH VIEW -->
@@ -7,18 +7,46 @@
<field name="model">scop.contribution.report</field>
<field name="arch" type="xml">
<search string="Cotisations">
- <field name='partner_id'/>
- <field name="year"/>
- <field name="type_contribution_id"/>
- <filter name="filter_paid" string="À régler" domain="[('amount_due', '!=', 0)]"/>
- <filter name="filter_paid" string="Réglé" domain="[('amount_due', '=', 0)]"/>
- <separator></separator>
- <filter name="filter_cg" string="Cotisations CG" domain="[('type_contribution_id', '=', 1)]"/>
- <filter name="filter_ur" string="Cotisations UR" domain="[('type_contribution_id', '=', 3)]"/>
- <filter name="filter_fede" string="Cotisations Fédé" domain="[('type_contribution_id', '=', 2)]"/>
+ <field name='partner_id' />
+ <field name="year" />
+ <field name="type_contribution_id" />
+ <filter
+ name="filter_paid"
+ string="À régler"
+ domain="[('amount_due', '!=', 0)]"
+ />
+ <filter
+ name="filter_paid"
+ string="Réglé"
+ domain="[('amount_due', '=', 0)]"
+ />
+ <separator />
+ <filter
+ name="filter_cg"
+ string="Cotisations CG"
+ domain="[('type_contribution_id', '=', 1)]"
+ />
+ <filter
+ name="filter_ur"
+ string="Cotisations UR"
+ domain="[('type_contribution_id', '=', 3)]"
+ />
+ <filter
+ name="filter_fede"
+ string="Cotisations Fédé"
+ domain="[('type_contribution_id', '=', 2)]"
+ />
<group expand="0" string="Group By">
- <filter name="group_by_type_contribution_id" string="Type de cotisation" context="{'group_by':'type_contribution_id'}"/>
- <filter name="group_by_year" string="Année" context="{'group_by':'year'}"/>
+ <filter
+ name="group_by_type_contribution_id"
+ string="Type de cotisation"
+ context="{'group_by':'type_contribution_id'}"
+ />
+ <filter
+ name="group_by_year"
+ string="Année"
+ context="{'group_by':'year'}"
+ />
</group>
</search>
</field>
@@ -30,12 +58,12 @@
<field name="model">scop.contribution.report</field>
<field name="arch" type="xml">
<tree string="Cotisations">
- <field name="year"/>
- <field name="type_contribution_id"/>
- <field name='partner_id'/>
- <field name='amount_called'/>
- <field name='amount_paid'/>
- <field name='amount_due'/>
+ <field name="year" />
+ <field name="type_contribution_id" />
+ <field name='partner_id' />
+ <field name='amount_called' />
+ <field name='amount_paid' />
+ <field name='amount_due' />
</tree>
</field>
</record>
@@ -47,8 +75,8 @@
<field name="arch" type="xml">
<form string="Cotisations">
<sheet>
- <h2><field name="name"/></h2>
- <separator></separator>
+ <h2><field name="name" /></h2>
+ <separator />
<table class="table table-striped table-hover">
<thead>
<tr>
@@ -59,15 +87,15 @@
</thead>
<tbody>
<tr>
- <td><field name='amount_called'/> €</td>
- <td><field name='amount_paid'/> €</td>
- <td><field name='amount_due'/> €</td>
+ <td><field name='amount_called' /> €</td>
+ <td><field name='amount_paid' /> €</td>
+ <td><field name='amount_due' /> €</td>
</tr>
</tbody>
</table>
- <separator></separator>
+ <separator />
<h4>Détail des Paiements</h4>
- <field name='payments' widget="html"/>
+ <field name='payments' widget="html" />
</sheet>
</form>
</field>
@@ -79,11 +107,11 @@
<field name="model">scop.contribution.report</field>
<field name="arch" type="xml">
<pivot string="Cotisations">
- <field name="year" type="row"/>
- <field name="type_contribution_id" type="row"/>
- <field name='amount_called' type="measure"/>
- <field name='amount_paid' type="measure"/>
- <field name='amount_due' type="measure"/>
+ <field name="year" type="row" />
+ <field name="type_contribution_id" type="row" />
+ <field name='amount_called' type="measure" />
+ <field name='amount_paid' type="measure" />
+ <field name='amount_due' type="measure" />
</pivot>
</field>
</record>
@@ -94,10 +122,10 @@
<field name="model">scop.contribution.report</field>
<field name="arch" type="xml">
<graph string="Cotisations">
- <field name="year"/>
- <field name='amount_called' type="measure"/>
- <field name='amount_paid' type="measure"/>
- <field name='amount_due' type="measure"/>
+ <field name="year" />
+ <field name='amount_called' type="measure" />
+ <field name='amount_paid' type="measure" />
+ <field name='amount_due' type="measure" />
</graph>
</field>
</record>
@@ -112,11 +140,11 @@
<!-- Menu -->
<menuitem
- id="scop_contribution_report_menu"
- name="Cotisations"
- parent="account.account_reports_management_menu"
- action="scop_contribution_report_action"
- sequence="80"
+ id="scop_contribution_report_menu"
+ name="Cotisations"
+ parent="account.account_reports_management_menu"
+ action="scop_contribution_report_action"
+ sequence="80"
/>
</data>
</odoo>
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
old mode 100755
new mode 100644
index 4f2ff5d..a6a75a0
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,2 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_scop_contribution_report_user,access_scop_contribution_report_user,model_scop_contribution_report,base.group_user,1,0,0,0
\ No newline at end of file
+access_scop_contribution_report_user,access_scop_contribution_report_user,model_scop_contribution_report,base.group_user,1,0,0,0
diff --git a/static/description/icon.png b/static/description/icon.png
old mode 100755
new mode 100644
index 82ef47760a441cf229b5009f0a18ccf3842fbfa5..499652a2c9c0307f875bafc145b6fbafa133da72
GIT binary patch
literal 15890
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
delta 9019
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
diff --git a/static/src/xml/account_payment.xml b/static/src/xml/account_payment.xml
index 5cc4c24..b2bfc27 100644
--- a/static/src/xml/account_payment.xml
+++ b/static/src/xml/account_payment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
<templates xml:space="preserve">
<!-- Copyright 2020 Le Filament
@@ -6,12 +6,14 @@
<t t-extend="ShowPaymentInfo">
<t t-jquery='div.oe_form_field' t-operation='replace'>
- <div class="oe_form_field"
- style="margin-right: 10px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"
- t-att-title="line.date_maturity + ' - ' + line.title">
- <t t-esc="line.date_maturity"></t> - <t t-esc="line.invoice"></t>
+ <div
+ class="oe_form_field"
+ style="margin-right: 10px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"
+ t-att-title="line.date_maturity + ' - ' + line.title"
+ >
+ <t t-esc="line.date_maturity" /> - <t t-esc="line.invoice" />
</div>
</t>
</t>
-</templates>
\ No newline at end of file
+</templates>
diff --git a/views/account_invoice.xml b/views/account_invoice.xml
deleted file mode 100644
index a63f118..0000000
--- a/views/account_invoice.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
- <data>
-
- <!-- Form -->
- <record id="invoice_form_scop_inherited" model="ir.ui.view">
- <field name="name">account.invoice.form.scop.inherited</field>
- <field name="model">account.invoice</field>
- <field name="mode">primary</field>
- <field name="inherit_id" ref="account.invoice_form"/>
- <field name="arch" type="xml">
- <field name="user_id" position="after">
- <field name="partner_ur_id" readonly="1" groups="base.group_no_one"/>
- <field name="is_contribution" readonly="1" groups="base.group_no_one"/>
- <field name="year" readonly="1"/>
- </field>
-
- <xpath expr="//sheet/group[last()]" position="after">
- <group name="cotisations" string="Cotisations">
- <field name="liasse_fiscale_id" readonly="1"/>
- </group>
- </xpath>
-
- <xpath expr="//field[@name='partner_id']" position="attributes">
- <attribute name="string">Adhérent</attribute>
- </xpath>
- <xpath expr="//field[@name='date_invoice']" position="attributes">
- <attribute name="string">Date de cotisation</attribute>
- </xpath>
- <xpath expr="//field[@name='user_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='team_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
-
-
- <xpath expr="//field[@name='beneficiary_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='lf_note_ref_facture']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='team_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
-
- <xpath expr="//sheet/h1/div/label[1]" position="attributes">
- <attribute name="string">Cotisation en brouillon</attribute>
- </xpath>
-
- </field>
- </record>
-
- <!-- Tree -->
- <record id="invoice_tree_scop_inherited" model="ir.ui.view">
- <field name="name">account.invoice.tree.scop.inherited</field>
- <field name="model">account.invoice</field>
- <field name="mode">primary</field>
- <field name="inherit_id" ref="account.invoice_tree_with_onboarding"/>
- <field name="arch" type="xml">
-
- <xpath expr="//field[@name='partner_id']" position="attributes">
- <attribute name="string">Adhérent</attribute>
- </xpath>
- <xpath expr="//field[@name='partner_id']" position="after">
- <field name="type_contribution_id"/>
- </xpath>
- <xpath expr="//field[@name='date_invoice']" position="attributes">
- <attribute name="string">Date de cotisation</attribute>
- </xpath>
- <xpath expr="//field[@name='user_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='company_id']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='origin']" position="attributes">
- <attribute name="invisible">True</attribute>
- </xpath>
- <xpath expr="//field[@name='state']" position="after">
- <field name="is_sdd" invisible="1"/>
- </xpath>
-
- </field>
- </record>
-
- <record id="invoice_scop_contribution_refund_tree" model="ir.ui.view">
- <field name="name">account.invoice.tree.scop.contribution</field>
- <field name="model">account.invoice</field>
- <field name="arch" type="xml">
- <tree create="0" edit="0" delete="0">
- <field name="name"/>
- <field name="date_invoice" string="Date d'émission"/>
- <field name="number"/>
- <field name="amount_total_signed" widget="monetary"/>
- <field name="state" invisible="1"/>
- </tree>
- </field>
- </record>
-
- <!-- Search -->
- <record id="invoice_search_scop_inherited" model="ir.ui.view">
- <field name="name">account.invoice.search.scop.inherited</field>
- <field name="model">account.invoice</field>
- <field name="priority" eval="25"/>
- <field name="arch" type="xml">
- <search string="Search Invoice">
- <filter name="draft" string="Brouillon" domain="[('state','=','draft')]"/>
- <filter name="unpaid" string="Ouvert" domain="[('state', '=', 'open')]"/>
- <!-- <filter name="in_payment" string="En Paiement" domain="[('state', '=', 'in_payment')]"/>-->
- <filter name="paid" string="Payé" domain="[('state', '=', 'paid')]"/>
- <filter name="late" string="Retard" domain="['&', ('date_due', '<', time.strftime('%%Y-%%m-%%d')), ('state', '=', 'open')]" help="Overdue invoices, maturity date passed"/>
- <separator/>
- <filter name="cotiz_equal_zero" domain="[('amount_total','=',0)]" string="Cotisation(s) égale(s) à 0"/>
- <separator/>
- <filter name="4_quarter" string="Sur 4 trimestres" domain="[('nb_quarter', '=', '4')]"/>
- <filter name="3_quarter" string="Sur 3 trimestres" domain="[('nb_quarter', '=', '3')]"/>
- <filter name="2_quarter" string="Sur 2 trimestres" domain="[('nb_quarter', '=', '2')]"/>
- <filter name="1_quarter" string="Sur 1 trimestre" domain="[('nb_quarter', '=', '1')]"/>
- <separator/>
- <filter name="is_sdd" string="Cotisation au prélèvement" domain="[('is_sdd', '=', True)]"/>
- <field name="partner_id" operator="child_of"/>
- <field name="number" string="Invoice" context="{'active_test': False}" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]"/>
- <!-- <field name="user_id" string="Salesperson" domain="[('share','=', False)]"/>-->
- <field name="date" string="Period"/>
- <group expand="0" string="Group By">
- <filter name="group_by_partner_id" string="Adhérent" context="{'group_by':'commercial_partner_id'}"/>
- <filter name="status" string="Statut" context="{'group_by':'state'}"/>
- <separator/>
- <filter string="Date de Facturation" name="invoicedate" context="{'group_by':'date_invoice'}"/>
- <filter string="Date d'échéance" name="duedate" context="{'group_by':'date_due'}"/>
- </group>
- </search>
- </field>
- </record>
-
- <!-- Action -->
- <record id="account.action_invoice_tree1" model="ir.actions.act_window">
- <field name="domain" eval="[('type','in', ['out_invoice']), ('is_contribution', '!=', True)]"/>
- </record>
-
- <!-- MENUS -->
- <menuitem id="menu_scop_cotisation"
- name="Cotisations"
- parent="account.menu_finance"
- sequence="2"/>
-
- </data>
-</odoo>
\ No newline at end of file
diff --git a/views/account_move.xml b/views/account_move.xml
index ab6ab0c..6fb8398 100644
--- a/views/account_move.xml
+++ b/views/account_move.xml
@@ -1,28 +1,236 @@
-<?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>
+ <!-- **************************************
+ Invoices changes for contribution
+ ************************************** -->
+ <!-- Form -->
+ <record id="account_ove_form_scop_inherited" model="ir.ui.view">
+ <field name="name">account.move.form.scop.inherited</field>
+ <field name="model">account.move</field>
+ <field name="mode">primary</field>
+ <field name="inherit_id" ref="account.view_move_form" />
+ <field name="arch" type="xml">
+ <xpath expr="//div[@name='journal_div']" position="after">
+ <field
+ name="partner_ur_id"
+ readonly="1"
+ groups="base.group_no_one"
+ />
+ <field
+ name="is_contribution"
+ readonly="1"
+ groups="base.group_no_one"
+ />
+ <field name="year" readonly="1" />
+ </xpath>
+
+ <xpath expr="//sheet/group[last()]" position="after">
+ <group name="cotisations" string="Cotisations">
+ <field name="liasse_fiscale_id" readonly="1" />
+ </group>
+ </xpath>
+
+ <xpath expr="//field[@name='partner_id']" position="attributes">
+ <attribute name="string">Adhérent</attribute>
+ </xpath>
+ <xpath expr="//field[@name='partner_id']" position="after">
+ <field name="partner_member_number" readonly="1" />
+ </xpath>
+ <xpath expr="//field[@name='invoice_date']" position="attributes">
+ <attribute name="string">Date de cotisation</attribute>
+ </xpath>
+ <xpath expr="//field[@name='user_id']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+ <xpath expr="//field[@name='team_id']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+
+ <xpath expr="//field[@name='beneficiary_id']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+ <xpath expr="//field[@name='team_id']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+ </field>
+ </record>
+
+ <!-- Tree -->
+ <record id="account_move_tree_scop_inherited" model="ir.ui.view">
+ <field name="name">account.move.tree.scop.inherited</field>
+ <field name="model">account.move</field>
+ <field name="mode">primary</field>
+ <field name="inherit_id" ref="account.view_out_invoice_tree" />
+ <field name="arch" type="xml">
+ <xpath expr="//field[@name='partner_id']" position="before">
+ <field name="partner_member_number" readonly="1" />
+ </xpath>
+ <xpath expr="//field[@name='partner_id']" position="attributes">
+ <attribute name="string">Adhérent</attribute>
+ </xpath>
+ <xpath expr="//field[@name='partner_id']" position="after">
+ <field name="type_contribution_id" />
+ </xpath>
+ <xpath expr="//field[@name='invoice_date']" position="attributes">
+ <attribute name="string">Date de cotisation</attribute>
+ </xpath>
+ <xpath expr="//field[@name='company_id']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+ <xpath expr="//field[@name='invoice_origin']" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </xpath>
+ <xpath expr="//field[@name='state']" position="after">
+ <field name="is_sdd" invisible="1" />
+ </xpath>
+
+ </field>
+ </record>
+
+ <record id="account_move_scop_contribution_refund_tree" model="ir.ui.view">
+ <field name="name">account.invoice.tree.scop.contribution</field>
+ <field name="model">account.move</field>
+ <field name="arch" type="xml">
+ <tree create="0" edit="0" delete="0">
+ <field name="name" />
+ <field name="invoice_date" string="Date d'émission" />
+ <field name="ref" />
+ <field name="amount_total_signed" widget="monetary" />
+ <field name="state" invisible="1" />
+ </tree>
+ </field>
+ </record>
+
+ <!-- Search -->
+ <record id="account_move_search_scop_inherited" model="ir.ui.view">
+ <field name="name">account.move.search.scop.inherited</field>
+ <field name="model">account.move</field>
+ <field name="priority" eval="25" />
+ <field name="arch" type="xml">
+ <search string="Search Invoice">
+ <filter
+ name="draft"
+ string="Brouillon"
+ domain="['|', ('state','=','draft'), ('move_type','in', ['out_invoice', 'out_refund'])]"
+ />
+ <filter
+ name="unpaid"
+ string="Non payées"
+ domain="[('payment_state', 'in', ['not_paid', 'in_payment', 'partial']), ('state', '=', 'posted')]"
+ />
+ <filter
+ name="paid"
+ string="Payé"
+ domain="[('payment_state', '=', 'paid'), ('state', '=', 'posted')]"
+ />
+ <filter
+ name="late"
+ string="Retard"
+ domain="['&', ('invoice_date_due', '<', time.strftime('%Y-%m-%d')), ('state', '=', 'posted'), ('payment_state', 'in', ('not_paid', 'partial'))]"
+ />
+ <separator />
+ <filter
+ name="cotiz_equal_zero"
+ domain="[('amount_total','=',0)]"
+ string="Cotisation(s) égale(s) à 0"
+ />
+ <separator />
+ <filter
+ name="is_sdd"
+ string="Cotisation au prélèvement"
+ domain="[('is_sdd', '=', True)]"
+ />
+ <field name="partner_id" operator="child_of" />
+ <field
+ name="name"
+ string="Invoice"
+ context="{'active_test': False}"
+ filter_domain="['|','|','|', ('name','ilike',self), ('invoice_origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]"
+ />
+ <field name="date" string="Period" />
+ <group expand="0" string="Group By">
+ <filter
+ name="group_by_partner_id"
+ string="Adhérent"
+ context="{'group_by':'commercial_partner_id'}"
+ />
+ <filter
+ name="status"
+ string="Statut"
+ context="{'group_by':'state'}"
+ />
+ <separator />
+ <filter
+ string="Date de Facturation"
+ name="invoicedate"
+ context="{'group_by':'invoice_date'}"
+ />
+ <filter
+ string="Date d'échéance"
+ name="duedate"
+ context="{'group_by':'invoice_date_due'}"
+ />
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <!-- Action -->
+ <record id="account.action_move_out_invoice_type" model="ir.actions.act_window">
+ <field
+ name="domain"
+ eval="[('move_type','=', 'out_invoice'), ('is_contribution', '!=', True)]"
+ />
+ </record>
+ <record id="account.action_move_out_refund_type" model="ir.actions.act_window">
+ <field
+ name="domain"
+ eval="[('move_type','=', 'out_refund'), ('is_contribution', '!=', True)]"
+ />
+ </record>
+
+ <!-- MENUS -->
+ <menuitem
+ id="menu_scop_cotisation"
+ name="Cotisations"
+ parent="account.menu_finance"
+ sequence="2"
+ />
+
+ <!-- **************************************
+ Move changes for SDD rejected payments
+ ************************************** -->
<!-- Tree View -->
<record id="scop_account_move_tree" model="ir.ui.view">
<field name="name">scop.account.move.tree</field>
<field name="model">account.move</field>
<field name="arch" type="xml">
- <tree decoration-info="state == 'draft'" string="Pièces comptables" create="0" edit="0">
- <field name="date"/>
- <field name="name"/>
- <field name="partner_id"/>
- <field name="ref"/>
- <field name="journal_id"/>
- <field name="amount" sum="Total Amount"/>
- <field name="reverse_date"/>
- <field name="reverse_entry_id"/>
- <button name="%(account.action_view_account_move_reversal)d" type="action"
- string="Rejeter (extourne)" class="btn-outline-danger btn-sm"
- attrs="{'invisible': [('reverse_entry_id', '!=', False), ('state', '=', 'posted')]}"/>
- <field name="state"/>
- <field name="currency_id" invisible="1"/>
+ <tree
+ decoration-info="state == 'draft'"
+ string="Pièces comptables"
+ create="0"
+ edit="0"
+ >
+ <field name="date" />
+ <field name="name" />
+ <field name="partner_id" />
+ <field name="ref" />
+ <field name="journal_id" />
+ <field name="amount_total" sum="Total Amount" />
+ <field name="reversed_entry_id" />
+ <button
+ name="%(account.action_view_account_move_reversal)d"
+ type="action"
+ string="Rejeter (extourne)"
+ class="btn-outline-danger btn-sm"
+ attrs="{'invisible': [('reversed_entry_id', '!=', False), ('state', '=', 'posted')]}"
+ />
+ <field name="state" />
+ <field name="currency_id" invisible="1" />
</tree>
</field>
</record>
@@ -33,13 +241,21 @@
<field name="model">account.move</field>
<field name="arch" type="xml">
<search string="Pièces comptables">
- <field name="partner_id" string="Adhérent"/>
- <field name="ref" string="Référence"/>
- <field name="name"/>
- <filter name="rejected" domain="[('reverse_entry_id', '!=', False)]" string="Rejetés"/>
- <filter name="not_rejected" domain="[('reverse_entry_id', '=', False)]" string="En cours"/>
+ <field name="partner_id" string="Adhérent" />
+ <field name="ref" string="Référence" />
+ <field name="name" />
+ <filter
+ name="rejected"
+ domain="[('reversed_entry_id', '!=', False)]"
+ string="Rejetés"
+ />
+ <filter
+ name="not_rejected"
+ domain="[('reversed_entry_id', '=', False)]"
+ string="En cours"
+ />
</search>
</field>
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/views/account_payment_line.xml b/views/account_payment_line.xml
index e176b5b..1fa4a22 100644
--- a/views/account_payment_line.xml
+++ b/views/account_payment_line.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). -->
@@ -9,17 +9,30 @@
<field name="model">account.payment.line</field>
<field name="arch" type="xml">
<tree string="Payment Lines" editable="top" create="0">
- <field name="partner_id"/>
- <field name="communication"/>
- <field name="partner_bank_id" domain="[('partner_id', '=', partner_id)]" options="{'no_create': 1}"/>
- <field name="mandate_id" domain="[('partner_id', '=', partner_id)]" options="{'no_create': 1}"/>
- <field name="move_line_id" invisible="1"/>
- <field name="ml_maturity_date"/>
- <field name="date" readonly="1"/>
- <field name="amount_currency" string="Montant"/>
- <field name="name"/>
- <field name="amount_company_currency" sum="Total in Company Currency" invisible="1"/>
- <field name="payment_type" invisible="1"/>
+ <field name="company_id" invisible="1" />
+ <field name="partner_id" />
+ <field name="communication" />
+ <field
+ name="partner_bank_id"
+ domain="[('partner_id', '=', partner_id)]"
+ options="{'no_create': 1}"
+ />
+ <field
+ name="mandate_id"
+ domain="[('partner_id', '=', partner_id)]"
+ options="{'no_create': 1}"
+ />
+ <field name="move_line_id" invisible="1" />
+ <field name="ml_maturity_date" />
+ <field name="date" readonly="1" />
+ <field name="amount_currency" string="Montant" />
+ <field name="name" />
+ <field
+ name="amount_company_currency"
+ sum="Total in Company Currency"
+ invisible="1"
+ />
+ <field name="payment_type" invisible="1" />
</tree>
</field>
</record>
@@ -30,13 +43,13 @@
<field name="model">account.payment.line</field>
<field name="arch" type="xml">
<search string="Lignes de paiement">
- <field name="partner_id" string="Adhérent"/>
- <field name="communication" string="N° Facture"/>
- <field name="mandate_id" string="Mandat de prélèvement"/>
- <field name="partner_bank_id" string="Compte bancaire"/>
+ <field name="partner_id" string="Adhérent" />
+ <field name="communication" string="N° Facture" />
+ <field name="mandate_id" string="Mandat de prélèvement" />
+ <field name="partner_bank_id" string="Compte bancaire" />
</search>
</field>
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/views/account_payment_order.xml b/views/account_payment_order.xml
index 47a3907..51df21e 100644
--- a/views/account_payment_order.xml
+++ b/views/account_payment_order.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,54 +7,90 @@
<record id="account_payment_order_form" model="ir.ui.view">
<field name="name">account.payment.order.form</field>
<field name="model">account.payment.order</field>
- <field name="inherit_id" ref="account_payment_order.account_payment_order_form"/>
+ <field
+ name="inherit_id"
+ ref="account_payment_order.account_payment_order_form"
+ />
+ <field name="priority">100</field>
<field name="arch" type="xml">
<xpath expr="//button[@name='action_cancel']" position="attributes">
- <attribute name="groups">base.group_system,cgscop_partner.group_cg_administrator</attribute>
- <attribute name="confirm">Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
+ <attribute
+ name="groups"
+ >base.group_system,cgscop_partner.group_cg_administrator</attribute>
+ <attribute
+ name="confirm"
+ >Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
</xpath>
- <xpath expr="//button[@name='action_done_cancel']" position="attributes">
- <attribute name="groups">base.group_system,cgscop_partner.group_cg_administrator</attribute>
- <attribute name="confirm">Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
+ <xpath
+ expr="//button[@name='action_uploaded_cancel']"
+ position="attributes"
+ >
+ <attribute
+ name="groups"
+ >base.group_system,cgscop_partner.group_cg_administrator</attribute>
+ <attribute
+ name="confirm"
+ >Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
</xpath>
<xpath expr="//field[@name='bank_line_count']" position="after">
- <field name="payment_line_amount"/>
- <field name="bank_line_amount"/>
- <button name="view_payment_line"
- type="object"
- string="Modifier les lignes de paiement"
- attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+ <field name="payment_line_amount" />
+ <field name="bank_line_amount" />
+ <button
+ name="view_payment_line"
+ type="object"
+ string="Modifier les lignes de paiement"
+ attrs="{'invisible': [('state', '!=', 'draft')]}"
+ />
</xpath>
<xpath expr="//field[@name='description']" position="after">
- <button name="view_account_move"
- type="object"
- string="Gérer les rejets de prélèvement"
- class="btn-info"
- attrs="{'invisible': [('state', 'not in', ('uploaded', 'done'))]}"/>
+ <button
+ name="view_account_move"
+ type="object"
+ string="Gérer les rejets de prélèvement"
+ class="btn-info"
+ attrs="{'invisible': [('state', 'not in', ('uploaded', 'done'))]}"
+ />
</xpath>
<xpath expr="//notebook" position="inside">
<page name="attachments" string="Fichiers de prélèvements">
<field name="attachment_ids">
<tree>
- <field name="create_date"/>
- <field name="name"/>
- <field name="type"/>
- <field name="datas" filename="datas_fname"/>
- <field name="create_uid"/>
+ <field name="create_date" />
+ <field name="name" />
+ <field name="type" />
+ <field name="datas" filename="datas_fname" />
+ <field name="create_uid" />
</tree>
<form>
- <h1><field name="name"/></h1>
+ <h1><field name="name" /></h1>
<group>
<group>
- <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" string="Télécharger le fichier"/>
- <field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
- <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
- <field name="mimetype" groups="base.group_no_one"/>
- <field name="type"/>
+ <field
+ name="datas"
+ filename="name"
+ attrs="{'invisible':[('type','=','url')]}"
+ string="Télécharger le fichier"
+ />
+ <field
+ name="name"
+ invisible="1"
+ attrs="{'invisible':[('type','=','url')]}"
+ class="oe_inline oe_right"
+ />
+ <field
+ name="url"
+ widget="url"
+ attrs="{'invisible':[('type','=','binary')]}"
+ />
+ <field
+ name="mimetype"
+ groups="base.group_no_one"
+ />
+ <field name="type" />
</group>
<group>
- <field name="create_uid"/>
- <field name="create_date"/>
+ <field name="create_uid" />
+ <field name="create_date" />
</group>
</group>
</form>
@@ -64,4 +100,4 @@
</field>
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml
index f97b36a..14380d6 100644
--- a/views/res_config_settings.xml
+++ b/views/res_config_settings.xml
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<data>
<record id="res_config_settings_view_form_cotisations" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.cotisations</field>
<field name="model">res.config.settings</field>
- <field name="priority" eval="25"/>
- <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+ <field name="priority" eval="25" />
+ <field name="inherit_id" ref="account.res_config_settings_view_form" />
<field name="arch" type="xml">
- <xpath expr="//div[@id='setup']" position="after">
+ <xpath
+ expr="//div[@name='fiscal_localization_setting_container']"
+ position="after"
+ >
<h2>Cotisations</h2>
<div class="row mt16 o_settings_container" name="contribution">
<div class="col-xs-12 col-md-6 o_setting_box">
@@ -16,26 +19,32 @@
<field name="is_contribution" />
</div>
<div class="o_setting_right_pane">
- <label for="is_contribution"/>
+ <label for="is_contribution" />
<div class="text-muted">
Activer la gestion des cotisations pour cette société
</div>
</div>
- <div class="o_setting_left_pane"/>
+ <div class="o_setting_left_pane" />
<div class="o_setting_right_pane">
- <label for="contribution_journal_id"/>
+ <label for="contribution_journal_id" />
<div class="text-muted">
Définit le journal des cotisations
</div>
- <field name="contribution_journal_id" options="{'no_open': True, 'no_create': True}"/>
+ <field
+ name="contribution_journal_id"
+ options="{'no_open': True, 'no_create': True}"
+ />
</div>
- <div class="o_setting_left_pane"/>
+ <div class="o_setting_left_pane" />
<div class="o_setting_right_pane">
- <label for="tag_cotiz_id"/>
+ <label for="tag_cotiz_id" />
<div class="text-muted">
Etiquette associée aux contacts cotisations
</div>
- <field name="tag_cotiz_id" options="{'no_open': True, 'no_create': True}"/>
+ <field
+ name="tag_cotiz_id"
+ options="{'no_open': True, 'no_create': True}"
+ />
</div>
</div>
</div>
@@ -44,4 +53,4 @@
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/views/res_partner.xml b/views/res_partner.xml
index b0a5c45..43b0281 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.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,21 +7,33 @@
<record id="scop_contact_view_form" model="ir.ui.view">
<field name="name">res.partner.scop.view.form</field>
<field name="model">res.partner</field>
- <field name="inherit_id" ref="cgscop_partner.scop_contact_view_form"/>
+ <field name="inherit_id" ref="cgscop_partner.scop_contact_view_form" />
<field name="arch" type="xml">
<xpath expr="//page[@name='scop_membership']" position="after">
- <page name='scop_contribution' string="Cotisations" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}">
+ <page
+ name='scop_contribution'
+ string="Cotisations"
+ attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"
+ >
<notebook>
<page name="contribution" string="Appels de Cotisations">
<field name="contribution_report_ids" mode="tree,form">
- <tree create="false" edit="false" delete="false" default_order="year desc">
- <field name="year"/>
- <field name="type_contribution_id"/>
- <field name='partner_id'/>
- <field name='amount_called'/>
- <field name='amount_paid'/>
- <field name='amount_due'/>
- <field name='is_loss' style="text-align: center;"/>
+ <tree
+ create="false"
+ edit="false"
+ delete="false"
+ default_order="year desc"
+ >
+ <field name="year" />
+ <field name="type_contribution_id" />
+ <field name='partner_id' />
+ <field name='amount_called' />
+ <field name='amount_paid' />
+ <field name='amount_due' />
+ <field
+ name='is_loss'
+ style="text-align: center;"
+ />
</tree>
</field>
</page>
@@ -31,4 +43,4 @@
</field>
</record>
</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/views/scop_cotisation_task.xml b/views/scop_cotisation_task.xml
deleted file mode 100644
index 456ec4d..0000000
--- a/views/scop_cotisation_task.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2021 Le Filament
- License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
-<odoo>
- <data>
-
- <!-- TREE VIEW -->
- <record model="ir.ui.view" id="view_scop_cotisation_task_tree">
- <field name="name">scop.cotisation.task.tree</field>
- <field name="model">scop.cotisation.task</field>
- <field name="arch" type="xml">
- <tree create="false" string="Taches création cotisations" default_order="create_date desc">
- <field name="create_date"/>
- <field name="year"/>
- <field name='status'/>
- <field name='cotiz_created'/>
- <field name='cotiz_to_create'/>
- <field name='is_error'/>
- <field name="message"/>
- </tree>
- </field>
- </record>
-
- <!-- ACTIONS VIEWS-->
- <record model="ir.actions.act_window" id="action_scop_cotisation_task">
- <field name="name">Taches cotisation</field>
- <field name="res_model">scop.cotisation.task</field>
- <field name="view_mode">tree,form</field>
- </record>
-
- <!-- MENU -->
- <menuitem id="menu_scop_cotisation_list_task"
- parent="account.menu_finance_configuration"
- name="Taches création cotisations"
- sequence="50"
- action="action_scop_cotisation_task"/>
-
- </data>
-</odoo>
\ No newline at end of file
diff --git a/wizard/__init__.py b/wizard/__init__.py
index 19819ad..6e7a64a 100644
--- a/wizard/__init__.py
+++ b/wizard/__init__.py
@@ -1,4 +1,4 @@
# © 2020 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from . import account_invoice_refund
+from . import account_move_reversal
diff --git a/wizard/account_invoice_refund.py b/wizard/account_invoice_refund.py
deleted file mode 100644
index ecbcf3e..0000000
--- a/wizard/account_invoice_refund.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# © 2020 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import models, api
-
-
-class ContributionAccountInvoiceRefund(models.TransientModel):
- _inherit = 'account.invoice.refund'
-
- def _get_refund(self, inv, mode):
- """
- Surcharge la la fonction initiale pour ajouter l'année
- et le type cotisation
- :param inv: facture
- :param mode: wizard mode
- :return: avoir
- """
- refund = super(
- ContributionAccountInvoiceRefund, self)._get_refund(inv, mode)
- refund.update({
- 'year': inv.year,
- 'is_contribution': inv.is_contribution,
- 'type_contribution_id': inv.type_contribution_id.id,
- 'payment_term_id': inv.payment_term_id.id,
- })
- return refund
diff --git a/wizard/account_move_reversal.py b/wizard/account_move_reversal.py
new file mode 100644
index 0000000..bc8cbeb
--- /dev/null
+++ b/wizard/account_move_reversal.py
@@ -0,0 +1,28 @@
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class ContributionAccountMoveReversal(models.TransientModel):
+ _inherit = "account.move.reversal"
+
+ def _prepare_default_reversal(self, move):
+ """
+ Surcharge la la fonction initiale pour ajouter l'année
+ et le type cotisation
+ :param move: facture
+ :return: avoir
+ """
+ refund = super(ContributionAccountMoveReversal, self)._prepare_default_reversal(
+ move
+ )
+ refund.update(
+ {
+ "year": move.year,
+ "is_contribution": move.is_contribution,
+ "type_contribution_id": move.type_contribution_id.id,
+ "payment_term_id": move.payment_term_id.id,
+ }
+ )
+ return refund
--
GitLab