From 1861943dad3680400f484dab432e67e12b0a1ff4 Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Wed, 2 Mar 2022 11:18:40 +0100 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 ++ LICENSE | 1238 ++++++++++++++++---------------- README.rst | 38 + __init__.py | 6 +- __manifest__.py | 39 +- models/__init__.py | 12 +- models/partner_activity.py | 209 +++--- models/res_partner.py | 94 +-- models/scop_followup_format.py | 46 +- security/ir.model.access.csv | 10 +- static/description/icon.png | Bin 9296 -> 13973 bytes views/res_partner.xml | 152 ++-- views/scop_followup_format.xml | 81 ++- 21 files changed, 1585 insertions(+), 936 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 100644 => 100755 LICENSE create mode 100644 README.rst 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 75bb204..818770f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,75 @@ -.* -*.pyc -!.gitignore +# 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..1c6434b --- /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/LICENSE b/LICENSE old mode 100644 new mode 100755 index fcce7f4..eb37caf --- a/LICENSE +++ b/LICENSE @@ -1,619 +1,619 @@ -GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..7c60010 --- /dev/null +++ b/README.rst @@ -0,0 +1,38 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + + +===================== +CG SCOP - Partner CRM +===================== + +Suivi de la relation avec la cooperative. + +Credits +======= + +Funders +------- + +The development of this module has been financially supported by: + + Confédération Générale des SCOP (https://www.les-scop.coop) + + +Contributors +------------ + +* Hervé Silvant <hsilvant@scop.coop> +* Juliana Poudou <juliana@le-filament.com> +* Benjamin Rivier <benjamin@le-filament.com> + + +Maintainer +---------- + +.. image:: https://le-filament.com/images/logo-lefilament.png + :alt: Le Filament + :target: https://le-filament.com + +This module is maintained by Le Filament diff --git a/__init__.py b/__init__.py index 44e0fd6..31660d6 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from . import models +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models diff --git a/__manifest__.py b/__manifest__.py index 36d2dcb..28a84e0 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,20 +1,19 @@ -# © 2021 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -{ - "name": "CG SCOP - Suivi de le relation cooperative", - "summary": "Suivi de le relation cooperative", - "version": "12.0.1.0.1", - "development_status": "Beta", - "author": "Le Filament", - "license": "AGPL-3", - "application": False, - "depends": ['cgscop_partner','cgscop_timesheet'], - "data": [ - "security/ir.model.access.csv", - "views/res_partner.xml", - "views/scop_followup_format.xml", - ], - 'installable': True, - 'auto_install': False, -} +# © 2021 Le Filament (<http://www.le-filament.com>) +# © 2021 Confédération Générale des Scop (<https://www.les-scop.coop>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "CG SCOP - Partner CRM", + "summary": "Suivi de la relation cooperative", + "version": "14.0.1.0.0", + "author": "Le Filament", + "license": "AGPL-3", + "application": False, + "depends": ["cgscop_partner", "cgscop_timesheet"], + "data": [ + "security/ir.model.access.csv", + "views/res_partner.xml", + "views/scop_followup_format.xml", + ], + "installable": True, + "auto_install": False, +} diff --git a/models/__init__.py b/models/__init__.py index 8064d55..5163134 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,6 +1,6 @@ -# © 2021 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import res_partner -from . import partner_activity -from . import scop_followup_format +# © 2021 Le Filament (<http://www.le-filament.com>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import res_partner +from . import partner_activity +from . import scop_followup_format diff --git a/models/partner_activity.py b/models/partner_activity.py index 4afa606..723ef1e 100644 --- a/models/partner_activity.py +++ b/models/partner_activity.py @@ -1,105 +1,104 @@ -# © 2020 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -import json - -from odoo import fields, models, api, tools, exceptions -import datetime - - -class ScopPartnerActivity(models.Model): - _name = 'scop.partner.activity' - _description = 'Activité par partner' - _order = 'year desc' - _auto = False - - # Vue - partner_id = fields.Many2one('res.partner', string='Coopérative', readonly=True ) - year = fields.Char("Année", readonly=True) - amount_dev = fields.Integer("Développement (hrs)", readonly=True) - amount_acc = fields.Integer("Suivi (hrs)", readonly=True) - amount_rev = fields.Integer("Révision (hrs)", readonly=True) - amount_for = fields.Integer("Formation (hrs)", readonly=True) - - # ------------------------------------------------------ - # Construction de la requete - # ------------------------------------------------------ - @api.model - def _select(self): - query = """ - SELECT - row_number() OVER () as id, - wrk.partner_id as partner_id, - wrk.year::varchar(10) as year, - sum(wrk.amount_rev) as amount_rev, - sum(wrk.amount_dev) as amount_dev, - sum(wrk.amount_acc) as amount_acc, - sum(wrk.amount_for) as amount_for - from ( - select - ac.partner_id as partner_id, - EXTRACT(YEAR FROM ac.date) as "year", - ac.unit_amount as amount_rev, - 0 as amount_dev, - 0 as amount_acc, - 0 as amount_for - from - account_analytic_line as ac - left join project_project as pu on pu.id = ac.project_id - left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id - where - pn.domain = 'R' - union all - select - ac.partner_id as partner_id, - EXTRACT(YEAR FROM ac.date) as "year", - 0 as amount_rev, - ac.unit_amount as amount_dev, - 0 as amount_acc, - 0 as amount_for - from - account_analytic_line as ac - left join project_project as pu on pu.id = ac.project_id - left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id - where - pn.domain = 'D' - union all - select - ac.partner_id as partner_id, - EXTRACT(YEAR FROM ac.date) as "year", - 0 as amount_rev, - 0 as amount_dev, - ac.unit_amount as amount_acc, - 0 as amount_for - from - account_analytic_line as ac - left join project_project as pu on pu.id = ac.project_id - left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id - where - pn.domain = 'A' - union all - select - ac.partner_id as partner_id, - EXTRACT(YEAR FROM ac.date) as "year", - 0 as amount_rev, - 0 as amount_dev, - 0 as amount_acc, - ac.unit_amount as amount_for - from - account_analytic_line as ac - left join project_project as pu on pu.id = ac.project_id - left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id - where - pn.domain = 'F' - ) as wrk - group BY - wrk.partner_id, - wrk.year - """ - return query - - 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._select())) \ No newline at end of file +# © 2021 Le Filament (<http://www.le-filament.com>) +# © 2021 Confédération Générale des Scop (<https://www.les-scop.coop>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +from odoo import api, fields, models, tools + + +class ScopPartnerActivity(models.Model): + _name = "scop.partner.activity" + _description = "Activité par partner" + _order = "year desc" + _auto = False + + # Vue + partner_id = fields.Many2one("res.partner", string="Coopérative", readonly=True) + year = fields.Char("Année", readonly=True) + amount_dev = fields.Integer("Développement (hrs)", readonly=True) + amount_acc = fields.Integer("Suivi (hrs)", readonly=True) + amount_rev = fields.Integer("Révision (hrs)", readonly=True) + amount_for = fields.Integer("Formation (hrs)", readonly=True) + + # ------------------------------------------------------ + # Construction de la requete + # ------------------------------------------------------ + @api.model + def _select(self): + query = """ + SELECT + row_number() OVER () as id, + wrk.partner_id as partner_id, + wrk.year::varchar(10) as year, + sum(wrk.amount_rev) as amount_rev, + sum(wrk.amount_dev) as amount_dev, + sum(wrk.amount_acc) as amount_acc, + sum(wrk.amount_for) as amount_for + from ( + select + ac.partner_id as partner_id, + EXTRACT(YEAR FROM ac.date) as "year", + ac.unit_amount as amount_rev, + 0 as amount_dev, + 0 as amount_acc, + 0 as amount_for + from + account_analytic_line as ac + left join project_project as pu on pu.id = ac.project_id + left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id + where + pn.domain = 'R' + union all + select + ac.partner_id as partner_id, + EXTRACT(YEAR FROM ac.date) as "year", + 0 as amount_rev, + ac.unit_amount as amount_dev, + 0 as amount_acc, + 0 as amount_for + from + account_analytic_line as ac + left join project_project as pu on pu.id = ac.project_id + left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id + where + pn.domain = 'D' + union all + select + ac.partner_id as partner_id, + EXTRACT(YEAR FROM ac.date) as "year", + 0 as amount_rev, + 0 as amount_dev, + ac.unit_amount as amount_acc, + 0 as amount_for + from + account_analytic_line as ac + left join project_project as pu on pu.id = ac.project_id + left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id + where + pn.domain = 'A' + union all + select + ac.partner_id as partner_id, + EXTRACT(YEAR FROM ac.date) as "year", + 0 as amount_rev, + 0 as amount_dev, + 0 as amount_acc, + ac.unit_amount as amount_for + from + account_analytic_line as ac + left join project_project as pu on pu.id = ac.project_id + left join cgscop_timesheet_code as pn on pn.id = pu.cgscop_timesheet_code_id + where + pn.domain = 'F' + ) as wrk + group BY + wrk.partner_id, + wrk.year + """ + return query + + 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._select()) + ) diff --git a/models/res_partner.py b/models/res_partner.py index 3d9fc3d..e163c50 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -1,45 +1,49 @@ -# © 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 -import datetime - - -class CgScopPartnerCrm(models.Model): - _inherit = "res.partner" - - partner_activity_ids = fields.One2many( - comodel_name='scop.partner.activity', - inverse_name='partner_id', - string='Activité', - readonly=True) - - followup_format_id = fields.Many2one( - 'scop.followup.format', - string='Format de suivi', - on_delete='restrict') - - followup_duree = fields.Integer("Durée thérorique du suivi annuel", - related='followup_format_id.duree', - store=False) - - followup_current_year = fields.Integer("Durée du suivi année en cours", - compute='_compute_followup_current_year', - store=False) - - # ------------------------------------------------------ - # Champs calculés durée du suivi de l'année en cours - # ------------------------------------------------------ - @api.multi - def _compute_followup_current_year(self): - for rec in self: - - # bilan de l'activité de l'année en cours - wyear = str(datetime.datetime.today().year) - acts = rec.partner_activity_ids.filtered( - lambda i: i.year == wyear) - - if len(acts)<=0: - rec.followup_current_year = 0 - else: - rec.followup_current_year = acts[0].amount_acc +# © 2021 Le Filament (<http://www.le-filament.com>) +# © 2021 Confédération Générale des Scop (<https://www.les-scop.coop>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import datetime + +from odoo import fields, models + + +class CgScopPartnerCrm(models.Model): + _inherit = "res.partner" + + partner_activity_ids = fields.One2many( + comodel_name="scop.partner.activity", + inverse_name="partner_id", + string="Activité", + readonly=True, + ) + + followup_format_id = fields.Many2one( + "scop.followup.format", string="Format de suivi", ondelete="restrict" + ) + + followup_duree = fields.Integer( + "Durée thérorique du suivi annuel", + related="followup_format_id.duree", + store=False, + ) + + followup_current_year = fields.Integer( + "Durée du suivi année en cours", + compute="_compute_followup_current_year", + store=False, + ) + + # ------------------------------------------------------ + # Champs calculés durée du suivi de l'année en cours + # ------------------------------------------------------ + def _compute_followup_current_year(self): + for rec in self: + + # bilan de l'activité de l'année en cours + wyear = str(datetime.datetime.today().year) + acts = rec.partner_activity_ids.filtered(lambda i: i.year == wyear) + + if len(acts) <= 0: + rec.followup_current_year = 0 + else: + rec.followup_current_year = acts[0].amount_acc diff --git a/models/scop_followup_format.py b/models/scop_followup_format.py index 1b42253..b7acaf9 100644 --- a/models/scop_followup_format.py +++ b/models/scop_followup_format.py @@ -1,22 +1,24 @@ -# © 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 ScopFollowUpFormat(models.Model): - _name = "scop.followup.format" - _description = "Format du suivi" - _order = 'ur_id, name' - - def _default_ur(self): - return self.env['res.company']._ur_default_get() - - name = fields.Char('Format du suivi') - ur_id = fields.Many2one( - 'union.regionale', - string='Union Régionale', - index=True, - on_delete='restrict', - default=_default_ur) - duree = fields.Integer("Durée du suivi") \ No newline at end of file +# © 2021 Le Filament (<http://www.le-filament.com>) +# © 2021 Confédération Générale des Scop (<https://www.les-scop.coop>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ScopFollowUpFormat(models.Model): + _name = "scop.followup.format" + _description = "Format du suivi" + _order = "ur_id, name" + + def _default_ur(self): + return self.env["res.company"]._ur_default_get() + + name = fields.Char("Format du suivi") + ur_id = fields.Many2one( + "union.regionale", + string="Union Régionale", + index=True, + ondelete="restrict", + default=_default_ur, + ) + duree = fields.Integer("Durée du suivi") diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 998d1e4..d5266fa 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -1,5 +1,5 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_scop_partner_activity,access_scop_partner_activity,model_scop_partner_activity,base.group_user,1,0,0,0 -access_scop_followup_format,access_scop_followup_format,model_scop_followup_format,base.group_user,1,0,0,0 -admin_scop_followup_format,admin_scop_followup_format,model_scop_followup_format,cgscop_partner.group_cg_administrator,1,1,1,1 -admin_ur_scop_followup_format,admin_ur_scop_followup_format,model_scop_followup_format,cgscop_partner.group_ur_list_modif,1,1,1,1 \ No newline at end of file +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_scop_partner_activity,access_scop_partner_activity,model_scop_partner_activity,base.group_user,1,0,0,0 +access_scop_followup_format,access_scop_followup_format,model_scop_followup_format,base.group_user,1,0,0,0 +admin_scop_followup_format,admin_scop_followup_format,model_scop_followup_format,cgscop_partner.group_cg_administrator,1,1,1,1 +admin_ur_scop_followup_format,admin_ur_scop_followup_format,model_scop_followup_format,cgscop_partner.group_ur_list_modif,1,1,1,1 diff --git a/static/description/icon.png b/static/description/icon.png index 7c4b282f22fa37ed748c5e23f644205ad340af1f..9002f6179b6459cee4ea49e69e8b5114e2f5d3d0 100644 GIT binary patch literal 13973 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 JWt~$(69BC){|f*B literal 9296 zcmeAS@N?(olHy`uVBq!ia0y~yVCZ3BVCdywVqjo+^^f%o0|NtNage(c!@6@aFBupZ zSkfJR9T^xl_H+M9WMyDr;4JWnEM{O3Qw3p0&mff#3=9lHC9V-A!TD(=<%vb94DLm# zsd>d2`6Y3o9IOls%Evuj978JN-o~~^i(J3;|6kMlo#rRE9*Ynbo;>47iEyvx^^o9@ zRSPr{m_>9NSdX-Ih&YB=dAwIrS`l%O$?S+;m#EGL>)N#Rvh-{3ZH>9tEqKQLMrrn& z-+$)SPP=KGo_6nk<?WfqhyUAb^6D4Y_7qbHo228gMkTT#!gCYD#z`rRNr5UazxJ#A zRSv9KBK$RKZrp`erhDckS~ob~ei*)%FUn3xb&K+Wq@~9vvz!ujT~gR4{NDCT><+yt z*E5X1ZJN#XBGmKBAC96|UPZT7sXy4&7A10a&Fy2yL_SrrZ=G7Y>sRz7F6L))jJZMu zX)kUEEm=N^<<5(esxW1{0M5|#9lEYt(nSmlEx+B2xvD)mMBg`LuZ`#5Qz>8TbFS>o zxsYD%6Sm*T^Y15>D>)mK|9!2wl*#*6`n2lwtn+abqYC!A8AQxb^*FE086#P6`O2B; zvI}d?AI9q+xK|qdeRJsF*Zf~kPrkZ0=jz`#|D}H2P`nk#l=VM=f5UP6Ilg`or`Gsi z4x2w+E~zRmZFRbLzoO@Q_W5cnJ#wE$s;S7z?`L?qeS41Z-rTFTZ|7a8Ue4H}IgP!R zuTZTn{?swC%<T1EEWB;m7L(_x+cv0hyo#E8rRU?)&?&#!a+a)q6)${s@7pW2)+=so zY4}%tbJefg592E?{VP1Q@UoEGf(2JUKWUxB@}=P`gKg?@jp+$FKTJfNtR7z2#kAm+ zz1gZbvm5Njndf^C9h@xWw{Xq|^^@Joo|9BeHQ%gVc*prFv+P81Ch;qN&3D-fmKT)F z)Jk)m^zKY(N4Lh^_mZEKJeoc%epniwZ`jy*!^8Zl_hcWjqFsC(QOq(O@5PG?k3L#k zz2ed<#!GKi8X30=)Le9Y<Q`ut@3A0$&Q}|5gQNp%+O2}~79N_oxoTGJ!<kjvC$TUG zmoJ{k=@rOd?4}uZ-f%%5!{k@l?e(VfyLH>D7<`NOSiIDmq~QL*<ksWoCo&JdvfJjt z`gY1C<BO-os<YWP+c=j0WP4)Kmi@BqrPw3|j)^@RUTgeYs{SO<_Ev)xQ)r0agu5C2 z*IruQD{#H5{Y>3+{d9v#-nxhF=B#Wwb>+_0e#?e8_xgV1&fM_Z;s^8L($d8<W~#I< z{4w{&hnE@e7Ti4=EpXsh{8sh4*i-Lqlmgd0e6`E_jHi&n61AO2=HA$lsS%%5ep8J7 z0cTKWq1~)EwJW+_xfx1(9uV*={HS_k!^(R0HjxuIEkE8r>h$vByC)}OR9;H@P2MUl z{qEEEL=VOzSHj<(w4cT;s(yi|YI{edN7H6;t*j0G>Ct5}RbmSL6=x^T+UHmOY0<vu zw4Y}jCaGkek5g6qvAXK7tYpxI<9v54_GWay`xRU8rj6Tt_KaC79Im}*ue>oR(LS;1 z)x!N<cH3@P=e=pm@pP3~cQ+>~X_A7-#)p=#_DwThenIrhwxh?-Tz~S`eYN@-O*K`| zDJ`d>a;}^aue`j_y0J^0y(nwLw=1e!_8rYhvYK?@;@xbuw_%HBUM>^=Y|dt}*F1K{ z)|WxXX&0I$kEE!)wB!|!UnBS6Lw`ZZu@}kR^}9RnSGue>z0R|y(__+?Tg6|0T(?^l z{?9XQ3B#Ow4DPp*7vH#$aiMMHQ4<x%pJ!QA7uFmUdhWlQ&tTcbxLIqsjHhm2rr^2$ z`n9-&_sX5UYi`Z`YtK?t>0Ry8^>sV1mEp=64Js0LJ`PM;J-6omvgex6SO4r}`g`Mc z!_t{5d*jM~s{NaJ{C;lVyY)<eY+TgVYkX{bsT>^c*)*l??hI}B#r3P!XERG&4!`%O zPiyjZpIBATtT5rpOcyq-DNFyu&%$%r(eF%`h-dDj&PD4cs=RD<UVb&-=kM{WZvL%v zZch5PdW*WA<d<Znmr|Zq6C)>gU1QsB9c#?k)?`?<p!scTbN!pfqQc2y+hUbG{R4jV zch8@(@^yCq*R9Mme3~!xJDpt3cVo8R4eNC`tc?Zk&08n;s3oj@t93wh^_GG&5}({2 zA8VT?J8SFv3mF9m{QYm9&Jh1$m!q{=DRS5Kqze-@mvE~%R+jvlRCPh*@#<Z6$6kN> z&b_YZ`%3xeSGR5a+%S*b;*tD$)!gulaTjwutW-2}Quv%I#5UVB7V#al|6a4`uY&pt z?UN_9UuG`c63uex3-6R<1ItX-k6)P<+`O=6zwNhgJddj5PZjFgD*NO~^6i}{JnfPE zxi-ec6{ix<^fsi`J!yG*gum{Gd+~<yyAQaZZs{xIZQq+9{>Z)l3rlGI&gdIUxASIh z_bUIj%F%n-1ic9=o^PJnm`o92{kl2)Yxxavk-fHw(S<pu<~=z3Vo!AaE13=E%Y*e4 zXMM5V)y+F;)|Jh3;uc>lUb{fz<Eh-L!k%686Lpf`?+DziY*P8V^!a-4Ufm$>#)5d= zxcn<~*Is|}PE}2}ecBCy^hfFSW+vVi1wwU`<Pw6oHBE&dt^IxL)#sQye3ueUzg;W2 zk}e<p>AOSSb;I1VtQlvHif@+wtiaQ4{?4)bg-n^C*7*$!XCB$k&3mQkxb$|0GQ-5a z>y?wfM9IF~a_k4&&Q<$sD>HKZ{QTnFuAN)qQd-}>ZT>%_2U+cYOZS?+(leFlyRP=a z)Az7%_6gmYrYBEnu(@UKUweM#&!e+_r<70mW$L~`Yu}q0F2-&0^F;Qxv3qHp_xKvH zMQqkAIX08U@-Bk5rhm6YyHD!6u;h)>zE5t4m-frv(Ad87M2q$pEB{G17O5Tkv4A~1 z+O*pvYQL$uwza<QY7?V{pH�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 diff --git a/views/res_partner.xml b/views/res_partner.xml index 9fb0569..b66613d 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -1,71 +1,81 @@ -<?xml version="1.0"?> -<!-- Copyright 2021 Le Filament - License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - -<odoo> - <data> - <record model="ir.ui.view" id="view_partner_crm_form"> - <field name="name">partner.crm.form</field> - <field name="model">res.partner</field> - <field name="inherit_id" ref="cgscop_partner.scop_contact_view_form"/> - <field name="priority" eval="1"/> - <field name="arch" type="xml"> - <page name='scop_contacts' position="after"> - <page name='scop_crm' string="Suivi de la relation" attrs="{'invisible': [('is_cooperative', '!=', True)]}"> - <group col="3"> - <field name="followup_format_id" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]" /> - <field name="followup_duree" readonly="1"/> - - </group> - <field name="partner_activity_ids" widget="one2many" > - <tree> - <field name="year" readonly="1" /> - <field name="amount_dev" readonly="1" /> - <field name="amount_acc" readonly="1" /> - <field name="amount_rev" readonly="1" /> - <field name="amount_for" readonly="1" /> - </tree> - </field> - - </page> - </page> - </field> - </record> - - <!-- Ajout d'une vue liste pour les coop --> - <record id="scop_partner_crm_view_tree" model="ir.ui.view"> - <field name="name">scop.partner.crm.view.tree</field> - <field name="model">res.partner</field> - <field name="arch" type="xml"> - <tree string="Cooperatives"> - <field name="display_name" string="Raison Sociale"/> - <field name="member_number_int"/> - <field name="cooperative_form_id"/> - <field name="zip"/> - <field name="city"/> - <field name="followup_delegate_id"/> - <field name="followup_format_id"/> - <field name="followup_duree" string="Durée théo. suivi (hrs)"/> - <field name="followup_current_year" string="Suivi réalisé (hrs)"/> - <field name="ur_id"/> - </tree> - </field> - </record> - - <!-- Ajout d'un regroupement pour les coop --> - <record id="scop_partner_crm_view_search" model="ir.ui.view"> - <field name="name">scop.partner.crm.view.search</field> - <field name="model">res.partner</field> - <field name="inherit_id" ref="cgscop_partner.scop_partner_view_search"/> - <field name="arch" type="xml"> - <filter name="group_country" position="after"> - - <filter name='group_followup_format' string='Format de suivi' domain="[]" context="{'group_by' :'followup_format_id'}"/> - - </filter> - - </field> - </record> - - </data> -</odoo> +<?xml version="1.0" ?> +<!-- Copyright 2021 Le Filament + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> +<odoo> + <data> + <record model="ir.ui.view" id="view_partner_crm_form"> + <field name="name">partner.crm.form</field> + <field name="model">res.partner</field> + <field name="inherit_id" ref="cgscop_partner.scop_contact_view_form" /> + <field name="priority" eval="1" /> + <field name="arch" type="xml"> + <page name='scop_contacts' position="after"> + <page + name='scop_crm' + string="Suivi de la relation" + attrs="{'invisible': [('is_cooperative', '!=', True)]}" + > + <group col="3"> + <field + name="followup_format_id" + options="{'no_open': True, 'no_create': True}" + domain="[('ur_id', '=', ur_id)]" + /> + <field name="followup_duree" readonly="1" /> + </group> + <field name="partner_activity_ids" widget="one2many"> + <tree> + <field name="year" readonly="1" /> + <field name="amount_dev" readonly="1" /> + <field name="amount_acc" readonly="1" /> + <field name="amount_rev" readonly="1" /> + <field name="amount_for" readonly="1" /> + </tree> + </field> + </page> + </page> + </field> + </record> + + <!-- Ajout d'une vue liste pour les coop --> + <record id="scop_partner_crm_view_tree" model="ir.ui.view"> + <field name="name">scop.partner.crm.view.tree</field> + <field name="model">res.partner</field> + <field name="arch" type="xml"> + <tree string="Cooperatives"> + <field name="display_name" string="Raison Sociale" /> + <field name="member_number_int" /> + <field name="cooperative_form_id" /> + <field name="zip" /> + <field name="city" /> + <field name="followup_delegate_id" /> + <field name="followup_format_id" /> + <field name="followup_duree" string="Durée théo. suivi (hrs)" /> + <field name="followup_current_year" string="Suivi réalisé (hrs)" /> + <field name="ur_id" /> + </tree> + </field> + </record> + + <!-- Ajout d'un regroupement pour les coop --> + <record id="scop_partner_crm_view_search" model="ir.ui.view"> + <field name="name">scop.partner.crm.view.search</field> + <field name="model">res.partner</field> + <field name="inherit_id" ref="cgscop_partner.scop_partner_view_search" /> + <field name="arch" type="xml"> + <filter name="group_country" position="after"> + + <filter + name='group_followup_format' + string='Format de suivi' + domain="[]" + context="{'group_by' :'followup_format_id'}" + /> + + </filter> + + </field> + </record> + + </data> +</odoo> diff --git a/views/scop_followup_format.xml b/views/scop_followup_format.xml index 2c3a50a..aaca47a 100644 --- a/views/scop_followup_format.xml +++ b/views/scop_followup_format.xml @@ -1,37 +1,44 @@ -<?xml version="1.0"?> -<!-- Copyright 2019 Le Filament - License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - -<odoo> - <data> - - <!-- Followup Format --> - <record id="view_scop_followup_format_tree" model="ir.ui.view"> - <field name="name">scop.followup.format.tree</field> - <field name="model">scop.followup.format</field> - <field name="arch" type="xml"> - <tree string="Formats de suivi" editable="top"> - <field name="name"/> - <field name="duree" /> - <field name="ur_id" options="{'no_open': True, 'no_create': True}"/> - </tree> - </field> - </record> - - <record id="action_view_scop_followup_format_tree" model="ir.actions.act_window"> - <field name="name">Format de suivi</field> - <field name="res_model">scop.followup.format</field> - <field name="view_mode">tree</field> - <field name="domain">[('ur_id', '=', ur_id)]</field> - <field name="help">Display and manage the list of Follow up Formats.</field> - </record> - - - <!-- MENUS --> - <menuitem id="menu_scop_followup_format" - parent="contacts.res_partner_menu_config" - action="action_view_scop_followup_format_tree" - groups="cgscop_partner.group_cg_administrator,cgscop_partner.group_ur_list_modif" - sequence="10"/> - </data> -</odoo> +<?xml version="1.0" ?> +<!-- Copyright 2019 Le Filament + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> +<odoo> + <data> + + <!-- Followup Format --> + <record id="view_scop_followup_format_tree" model="ir.ui.view"> + <field name="name">scop.followup.format.tree</field> + <field name="model">scop.followup.format</field> + <field name="arch" type="xml"> + <tree string="Formats de suivi" editable="top"> + <field name="name" /> + <field name="duree" /> + <field + name="ur_id" + options="{'no_open': True, 'no_create': True}" + /> + </tree> + </field> + </record> + + <record + id="action_view_scop_followup_format_tree" + model="ir.actions.act_window" + > + <field name="name">Format de suivi</field> + <field name="res_model">scop.followup.format</field> + <field name="view_mode">tree</field> + <field name="domain">[('ur_id', '=', ur_id)]</field> + <field name="help">Display and manage the list of Follow up Formats.</field> + </record> + + + <!-- MENUS --> + <menuitem + id="menu_scop_followup_format" + parent="contacts.res_partner_menu_config" + action="action_view_scop_followup_format_tree" + groups="cgscop_partner.group_cg_administrator,cgscop_partner.group_ur_list_modif" + sequence="10" + /> + </data> +</odoo> -- GitLab