diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..bfd7ac53df9f103f6dc8853738c63fd364445fde --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# Configuration for known file extensions +[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{json,yml,yaml,rst,md}] +indent_size = 2 + +# Do not configure editor for libs and autogenerated content +[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}] +charset = unset +end_of_line = unset +indent_size = unset +indent_style = unset +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/.eslintrc.yml b/.eslintrc.yml new file mode 100644 index 0000000000000000000000000000000000000000..d4cc423ccda9db9691205c9da83307af97b2670f --- /dev/null +++ b/.eslintrc.yml @@ -0,0 +1,187 @@ +env: + browser: true + es6: true + +# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 +parserOptions: + ecmaVersion: 2017 + +overrides: + - files: + - "**/*.esm.js" + parserOptions: + sourceType: module + +# Globals available in Odoo that shouldn't produce errorings +globals: + _: readonly + $: readonly + fuzzy: readonly + jQuery: readonly + moment: readonly + odoo: readonly + openerp: readonly + owl: readonly + +# Styling is handled by Prettier, so we only need to enable AST rules; +# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 +rules: + accessor-pairs: warn + array-callback-return: warn + callback-return: warn + capitalized-comments: + - warn + - always + - ignoreConsecutiveComments: true + ignoreInlineComments: true + complexity: + - warn + - 15 + constructor-super: warn + dot-notation: warn + eqeqeq: warn + global-require: warn + handle-callback-err: warn + id-blacklist: warn + id-match: warn + init-declarations: error + max-depth: warn + max-nested-callbacks: warn + max-statements-per-line: warn + no-alert: warn + no-array-constructor: warn + no-caller: warn + no-case-declarations: warn + no-class-assign: warn + no-cond-assign: error + no-const-assign: error + no-constant-condition: warn + no-control-regex: warn + no-debugger: error + no-delete-var: warn + no-div-regex: warn + no-dupe-args: error + no-dupe-class-members: error + no-dupe-keys: error + no-duplicate-case: error + no-duplicate-imports: error + no-else-return: warn + no-empty-character-class: warn + no-empty-function: error + no-empty-pattern: error + no-empty: warn + no-eq-null: error + no-eval: error + no-ex-assign: error + no-extend-native: warn + no-extra-bind: warn + no-extra-boolean-cast: warn + no-extra-label: warn + no-fallthrough: warn + no-func-assign: error + no-global-assign: error + no-implicit-coercion: + - warn + - allow: ["~"] + no-implicit-globals: warn + no-implied-eval: warn + no-inline-comments: warn + no-inner-declarations: warn + no-invalid-regexp: warn + no-irregular-whitespace: warn + no-iterator: warn + no-label-var: warn + no-labels: warn + no-lone-blocks: warn + no-lonely-if: error + no-mixed-requires: error + no-multi-str: warn + no-native-reassign: error + no-negated-condition: warn + no-negated-in-lhs: error + no-new-func: warn + no-new-object: warn + no-new-require: warn + no-new-symbol: warn + no-new-wrappers: warn + no-new: warn + no-obj-calls: warn + no-octal-escape: warn + no-octal: warn + no-param-reassign: warn + no-path-concat: warn + no-process-env: warn + no-process-exit: warn + no-proto: warn + no-prototype-builtins: warn + no-redeclare: warn + no-regex-spaces: warn + no-restricted-globals: warn + no-restricted-imports: warn + no-restricted-modules: warn + no-restricted-syntax: warn + no-return-assign: error + no-script-url: warn + no-self-assign: warn + no-self-compare: warn + no-sequences: warn + no-shadow-restricted-names: warn + no-shadow: warn + no-sparse-arrays: warn + no-sync: warn + no-this-before-super: warn + no-throw-literal: warn + no-undef-init: warn + no-undef: error + no-unmodified-loop-condition: warn + no-unneeded-ternary: error + no-unreachable: error + no-unsafe-finally: error + no-unused-expressions: error + no-unused-labels: error + no-unused-vars: error + no-use-before-define: error + no-useless-call: warn + no-useless-computed-key: warn + no-useless-concat: warn + no-useless-constructor: warn + no-useless-escape: warn + no-useless-rename: warn + no-void: warn + no-with: warn + operator-assignment: [error, always] + prefer-const: warn + radix: warn + require-yield: warn + sort-imports: warn + spaced-comment: [error, always] + strict: [error, function] + use-isnan: error + valid-jsdoc: + - warn + - prefer: + arg: param + argument: param + augments: extends + constructor: class + exception: throws + func: function + method: function + prop: property + return: returns + virtual: abstract + yield: yields + preferType: + array: Array + bool: Boolean + boolean: Boolean + number: Number + object: Object + str: String + string: String + requireParamDescription: false + requireReturn: false + requireReturnDescription: false + requireReturnType: false + valid-typeof: warn + yoda: warn diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000000000000000000000000000000000..e397e8ed4e3e7f7fe7785dd391bb80aa6d85575e --- /dev/null +++ b/.flake8 @@ -0,0 +1,12 @@ +[flake8] +max-line-length = 88 +max-complexity = 16 +# B = bugbear +# B9 = bugbear opinionated (incl line length) +select = C,E,F,W,B,B9 +# E203: whitespace before ':' (black behaviour) +# E501: flake8 line length (covered by bugbear B950) +# W503: line break before binary operator (black behaviour) +ignore = E203,E501,W503 +per-file-ignores= + __init__.py:F401 diff --git a/.gitignore b/.gitignore index 75bb2042901930f807a588241612a29dd75e34d5..818770fb1bdc0a144e924c9a5940f0b035df8a0d 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 0000000000000000000000000000000000000000..0ec187efd1bf802844749f508cda0c8f138970f9 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,13 @@ +[settings] +; see https://github.com/psf/black +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +combine_as_imports=True +use_parentheses=True +line_length=88 +known_odoo=odoo +known_odoo_addons=odoo.addons +sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER +default_section=THIRDPARTY +ensure_newline_before_comments = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1c6434bfc2274c73d98dbf62b6de9baccdc353ce --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,127 @@ +exclude: | + (?x) + # NOT INSTALLABLE ADDONS + # END NOT INSTALLABLE ADDONS + # Files and folders generated by bots, to avoid loops + ^setup/|/static/description/index\.html$| + # We don't want to mess with tool-generated files + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| + # Maybe reactivate this when all README files include prettier ignore tags? + ^README\.md$| + # Library files can have extraneous formatting (even minimized) + /static/(src/)?lib/| + # Repos using Sphinx to generate docs don't need prettying + ^docs/_templates/.*\.html$| + # You don't usually want a bot to modify your legal texts + (LICENSE.*|COPYING.*) +default_language_version: + python: python3 + node: "14.13.0" +repos: + - repo: local + hooks: + # These files are most likely copier diff rejection junks; if found, + # review them manually, fix the problem (if needed) and remove them + - id: forbidden-files + name: forbidden files + entry: found forbidden files; remove them + language: fail + files: "\\.rej$" + - repo: https://github.com/oca/maintainer-tools + rev: ab1d7f6 + hooks: + # update the NOT INSTALLABLE ADDONS section above + - id: oca-update-pre-commit-excluded-addons + - id: oca-fix-manifest-website + args: ["https://le-filament.com"] + - repo: https://github.com/myint/autoflake + rev: v1.4 + hooks: + - id: autoflake + args: + - --expand-star-imports + - --ignore-init-module-imports + - --in-place + - --remove-all-unused-imports + - --remove-duplicate-keys + - --remove-unused-variables + - repo: https://github.com/psf/black + rev: 20.8b1 + hooks: + - id: black + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.1.2 + hooks: + - id: prettier + name: prettier (with plugin-xml) + additional_dependencies: + - "prettier@2.1.2" + - "@prettier/plugin-xml@0.12.0" + args: + - --plugin=@prettier/plugin-xml + files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ + - repo: https://github.com/pre-commit/mirrors-eslint + rev: v7.8.1 + hooks: + - id: eslint + verbose: true + args: + - --color + - --fix + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: end-of-file-fixer + # exclude autogenerated files + exclude: /README\.rst$|\.pot?$ + - id: debug-statements + - id: fix-encoding-pragma + args: ["--remove"] + - id: check-case-conflict + - id: check-docstring-first + - id: check-executables-have-shebangs + - id: check-merge-conflict + # exclude files where underlines are not distinguishable from merge conflicts + exclude: /README\.rst$|^docs/.*\.rst$ + - id: check-symlinks + - id: check-xml + - id: mixed-line-ending + args: ["--fix=lf"] + - repo: https://github.com/asottile/pyupgrade + rev: v2.7.2 + hooks: + - id: pyupgrade + args: ["--keep-percent-format"] + - repo: https://github.com/PyCQA/isort + rev: 5.5.1 + hooks: + - id: isort + name: isort except __init__.py + args: + - --settings=. + exclude: /__init__\.py$ + - repo: https://gitlab.com/PyCQA/flake8 + rev: 3.8.3 + hooks: + - id: flake8 + name: flake8 + additional_dependencies: ["flake8-bugbear==20.1.4"] + - repo: https://github.com/PyCQA/pylint + rev: pylint-2.5.3 + hooks: + - id: pylint + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true + additional_dependencies: &pylint_deps + - pylint-odoo==3.5.0 + - id: pylint + name: pylint with mandatory checks + args: + - --rcfile=.pylintrc-mandatory + additional_dependencies: *pylint_deps diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000000000000000000000000000000000000..5b6d4b361ace92f3877993bf2848fac190d8fab6 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,8 @@ +# Defaults for all prettier-supported languages. +# Prettier will complete this with settings from .editorconfig file. +bracketSpacing: false +printWidth: 88 +proseWrap: always +semi: true +trailingComma: "es5" +xmlWhitespaceSensitivity: "strict" diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000000000000000000000000000000000000..dc6270e15be0c08da00e768a570f27c785d8630e --- /dev/null +++ b/.pylintrc @@ -0,0 +1,87 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Le Filament +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=14.0 + +[MESSAGES CONTROL] +disable=all + +# This .pylintrc contains optional AND mandatory checks and is meant to be +# loaded in an IDE to have it check everything, in the hope this will make +# optional checks more visible to contributors who otherwise never look at a +# green travis to see optional checks that failed. +# .pylintrc-mandatory containing only mandatory checks is used the pre-commit +# config as a blocking check. + +enable=anomalous-backslash-in-string, + api-one-deprecated, + api-one-multi-together, + assignment-from-none, + attribute-deprecated, + class-camelcase, + dangerous-default-value, + dangerous-view-replace-wo-priority, + development-status-allowed, + duplicate-id-csv, + duplicate-key, + duplicate-xml-fields, + duplicate-xml-record-id, + eval-referenced, + eval-used, + incoherent-interpreter-exec-perm, + license-allowed, + manifest-author-string, + manifest-deprecated-key, + manifest-required-author, + manifest-required-key, + manifest-version-format, + method-compute, + method-inverse, + method-required-super, + method-search, + openerp-exception-warning, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + redundant-modulename-xml, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + sql-injection, + too-few-format-args, + translation-field, + translation-required, + unreachable, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error, + # messages that do not cause the lint step to fail + consider-merging-classes-inherited, + create-user-wo-reset-password, + dangerous-filter-wo-user, + deprecated-module, + file-not-used, + invalid-commit, + missing-manifest-dependency, + missing-newline-extrafiles, + no-utf8-coding-comment, + odoo-addons-relative-import, + old-api7-method-defined, + redefined-builtin, + too-complex, + unnecessary-utf8-coding-comment + + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory new file mode 100644 index 0000000000000000000000000000000000000000..43ea23947166ff8080219007cfae43ec54a28f8e --- /dev/null +++ b/.pylintrc-mandatory @@ -0,0 +1,64 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Le Filament +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=14.0 + +[MESSAGES CONTROL] +disable=all + +enable=anomalous-backslash-in-string, + api-one-deprecated, + api-one-multi-together, + assignment-from-none, + attribute-deprecated, + class-camelcase, + dangerous-default-value, + dangerous-view-replace-wo-priority, + development-status-allowed, + duplicate-id-csv, + duplicate-key, + duplicate-xml-fields, + duplicate-xml-record-id, + eval-referenced, + eval-used, + incoherent-interpreter-exec-perm, + license-allowed, + manifest-author-string, + manifest-deprecated-key, + manifest-required-author, + manifest-required-key, + manifest-version-format, + method-compute, + method-inverse, + method-required-super, + method-search, + openerp-exception-warning, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + redundant-modulename-xml, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + sql-injection, + too-few-format-args, + translation-field, + translation-required, + unreachable, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no diff --git a/README.rst b/README.rst new file mode 100644 index 0000000000000000000000000000000000000000..39cae0344cd4cb4185f43e5a31b8270bcb417d3b --- /dev/null +++ b/README.rst @@ -0,0 +1,28 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + + +=========================== +CG SCOP - Form.coop Alfodoo +=========================== + +Connexion Alfodoo pour Form.Coop + + +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> +* Benjamin Rivier <benjamin@le-filament.com> diff --git a/__init__.py b/__init__.py index cd78c3da2d36f43264fcefcefb6178d400cb0a39..48e1758c82ff2acfdf8618bcbf8c4c296a4ed7f9 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,5 @@ -# © 2021 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import models +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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 . import models diff --git a/__manifest__.py b/__manifest__.py index eb7827c8d343821885307138e5d36a63d2be7c62..d7e6ac1f415127204112ff45fcb523278ac8d066 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,22 +1,26 @@ -# © 2021 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -{ - 'name': "CG Scop - Alfodoo Form.Coop", - 'summary': "Connexion Alfodoo pour Form.Coop", - 'author': "Le Filament", - 'website': "https://www.le-filament.com", - 'version': '12.0.1.0.1', - 'license': "AGPL-3", - 'depends': [ - "cgscop_form_coop", - "cmis", - "cmis_field", - "cmis_web", - "lefilament_alfodoo", - ], - 'data': [ - 'views/cmis_backend.xml', - 'views/cgscop_form_coop_demande_views.xml', - 'views/cgscop_form_coop_demande_collective_views.xml', - ], -} +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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 - Alfodoo Form.Coop", + "summary": "Connexion Alfodoo pour Form.Coop", + "author": "Le Filament", + "website": "https://www.le-filament.com", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "depends": [ + "cgscop_form_coop", + "cmis", + "cmis_field", + "cmis_web", + "lefilament_alfodoo", + ], + "data": [ + "views/cmis_backend.xml", + "views/cgscop_form_coop_demande_views.xml", + "views/cgscop_form_coop_demande_collective_views.xml", + ], + "external_dependencies": { + "python": ["cmislib"], + }, +} diff --git a/models/__init__.py b/models/__init__.py index 6c5b5cebf88d0ef9b0489812dc530daf2987f329..f0ac74450dc5a1ab760a0a85f46141a21a1e6668 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,5 +1,7 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import cgscop_form_coop_demande -from . import cgscop_form_coop_demande_collective -from . import cmis_backend +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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 . import cgscop_form_coop_demande +from . import cgscop_form_coop_demande_collective +from . import cmis_backend diff --git a/models/cgscop_form_coop_demande.py b/models/cgscop_form_coop_demande.py index 268944c28f065b46093f919d8547d0de8d2efdcd..3136dbf75b013f7d637817a24b115dcd91a66fe4 100644 --- a/models/cgscop_form_coop_demande.py +++ b/models/cgscop_form_coop_demande.py @@ -1,65 +1,67 @@ -# Copyright 2019 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import models, exceptions, api -from odoo.addons.cmis_field import fields - - -class CgscopFormpCoopDemandeAlfodoo(models.Model): - _inherit = 'cgscop_form_coop.demande' - - fc_cmis_folder = fields.CmisFolder( - allow_create=True, - allow_delete=False, - create_method='_create_folder', - ) - - # ------------------------------------------------------ - # Override Parent - # ------------------------------------------------------ - @api.model - def create(self, values): - """ - Create Alfresco folder when creating order - """ - res = super(CgscopFormpCoopDemandeAlfodoo, self).create(values) - if not res.fc_cmis_folder: - backend = self.env['cmis.backend'].search([], limit=1) - fullpath = self.get_folder_path(res.number, backend) - res.fc_cmis_folder = backend.get_folder_by_path(fullpath) - return res - - # ------------------------------------------------------ - # Override Alfodoo - # ------------------------------------------------------ - def _create_folder(self, record, backend): - """ - Récupère ou crée le répertoire FC si il n'existe pas - :param records: lm records - :param backend: lm backend - :return: fc_cmis_folder objectId - """ - # Check de si le répertoire existe - if (backend == False): - backend = self.env['cmis.backend'].search([], limit=1) - - for dmd in self: - # On construit le chemin - fullpath = self.get_folder_path(dmd.number, backend) - dmd.fc_cmis_folder = backend.get_folder_by_path(fullpath) - - # ------------------------------------------------------ - # retourne le chemin du dossier - # ------------------------------------------------------ - def get_folder_path(self, number, backend): - - # Check de si le répertoire existe - if (backend == False): - backend = self.env['cmis.backend'].search([], limit=1) - - base_path = backend.formcoop_directory_write - path_parts = ['Dossiers', str(number)] - path = '/'.join(path_parts) - fullpath = base_path + path - - return fullpath +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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, models + +from odoo.addons.cmis_field import fields + + +class CgscopFormpCoopDemandeAlfodoo(models.Model): + _inherit = "cgscop_form_coop.demande" + + fc_cmis_folder = fields.CmisFolder( + allow_create=True, + allow_delete=False, + create_method="_create_folder", + ) + + # ------------------------------------------------------ + # Override Parent + # ------------------------------------------------------ + @api.model + def create(self, values): + """ + Create Alfresco folder when creating order + """ + res = super(CgscopFormpCoopDemandeAlfodoo, self).create(values) + if not res.fc_cmis_folder: + backend = self.env["cmis.backend"].search([], limit=1) + fullpath = self.get_folder_path(res.number, backend) + res.fc_cmis_folder = backend.get_folder_by_path(fullpath) + return res + + # ------------------------------------------------------ + # Override Alfodoo + # ------------------------------------------------------ + def _create_folder(self, record, backend): + """ + Récupère ou crée le répertoire FC si il n'existe pas + :param records: lm records + :param backend: lm backend + :return: fc_cmis_folder objectId + """ + # Check de si le répertoire existe + if not backend: + backend = self.env["cmis.backend"].search([], limit=1) + + for dmd in self: + # On construit le chemin + fullpath = self.get_folder_path(dmd.number, backend) + dmd.fc_cmis_folder = backend.get_folder_by_path(fullpath) + + # ------------------------------------------------------ + # retourne le chemin du dossier + # ------------------------------------------------------ + def get_folder_path(self, number, backend): + + # Check de si le répertoire existe + if not backend: + backend = self.env["cmis.backend"].search([], limit=1) + + base_path = backend.formcoop_directory_write + path_parts = ["Dossiers", str(number)] + path = "/".join(path_parts) + fullpath = base_path + path + + return fullpath diff --git a/models/cgscop_form_coop_demande_collective.py b/models/cgscop_form_coop_demande_collective.py index 6368af30808f817c3939c1e270a912aab82ff2a3..31b3f32dd35ed631708cda85e6811aae92c0561e 100644 --- a/models/cgscop_form_coop_demande_collective.py +++ b/models/cgscop_form_coop_demande_collective.py @@ -1,17 +1,19 @@ -# Copyright 2019 Le Filament (<http://www.le-filament.com>) +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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 models, exceptions, api +from odoo import api, models + from odoo.addons.cmis_field import fields class CgscopFormpCoopDemandeCollectiveAlfodoo(models.Model): - _inherit = 'cgscop_form_coop.demande_collective' + _inherit = "cgscop_form_coop.demande_collective" fc_cmis_folder = fields.CmisFolder( allow_create=True, allow_delete=False, - create_method='_create_folder', + create_method="_create_folder", ) # ------------------------------------------------------ @@ -24,7 +26,7 @@ class CgscopFormpCoopDemandeCollectiveAlfodoo(models.Model): """ res = super(CgscopFormpCoopDemandeCollectiveAlfodoo, self).create(values) if not res.fc_cmis_folder: - backend = self.env['cmis.backend'].search([], limit=1) + backend = self.env["cmis.backend"].search([], limit=1) fullpath = self.get_folder_path(res.number, backend) res.fc_cmis_folder = backend.get_folder_by_path(fullpath) return res @@ -40,8 +42,8 @@ class CgscopFormpCoopDemandeCollectiveAlfodoo(models.Model): :return: fc_cmis_folder objectId """ # Check de si le répertoire existe - if (backend == False): - backend = self.env['cmis.backend'].search([], limit=1) + if not backend: + backend = self.env["cmis.backend"].search([], limit=1) for dmd in self: # On construit le chemin @@ -54,12 +56,12 @@ class CgscopFormpCoopDemandeCollectiveAlfodoo(models.Model): def get_folder_path(self, number, backend): # Check de si le répertoire existe - if (backend == False): - backend = self.env['cmis.backend'].search([], limit=1) + if not backend: + backend = self.env["cmis.backend"].search([], limit=1) base_path = backend.formcoop_directory_write - path_parts = ['Dossiers', str(number)] - path = '/'.join(path_parts) + path_parts = ["Dossiers", str(number)] + path = "/".join(path_parts) fullpath = base_path + path return fullpath diff --git a/models/cmis_backend.py b/models/cmis_backend.py index 40741e05e3cb282570f02c97d5344bafd4200dd6..488087220181df7460064e79a9055160414196f4 100644 --- a/models/cmis_backend.py +++ b/models/cmis_backend.py @@ -1,11 +1,13 @@ -# © 2021 Le Filament (<http://www.le-filament.com>) +# © 2020 Le Filament (<https://www.le-filament.com>) +# © 2020 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 models, fields +from odoo import fields, models class CgscopAlfrescoFormCoopBackend(models.Model): - _inherit = 'cmis.backend' + _inherit = "cmis.backend" formcoop_directory_write = fields.Char( - 'Repertoire écriture Form.Coop', required=True, default='/') + "Repertoire écriture Form.Coop", required=True, default="/" + ) diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv deleted file mode 100644 index 06d9306f299842e34a7dae1004bb25666b09cfba..0000000000000000000000000000000000000000 --- a/security/ir.model.access.csv +++ /dev/null @@ -1 +0,0 @@ -id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink diff --git a/static/description/icon.png b/static/description/icon.png index 7c4b282f22fa37ed748c5e23f644205ad340af1f..9002f6179b6459cee4ea49e69e8b5114e2f5d3d0 100644 Binary files a/static/description/icon.png and b/static/description/icon.png differ diff --git a/views/cgscop_form_coop_demande_collective_views.xml b/views/cgscop_form_coop_demande_collective_views.xml index 8d82708ef29122dbacff80896d9d1c55497dd879..71eccb3ab7e7ad5bd0c95955f174e975a8569e1a 100644 --- a/views/cgscop_form_coop_demande_collective_views.xml +++ b/views/cgscop_form_coop_demande_collective_views.xml @@ -1,26 +1,33 @@ -<?xml version="1.0"?> -<!-- Copyright 2019 Le Filament +<?xml version="1.0" ?> +<!-- Copyright 2020 Le Filament + Copyright 2020 Confédération Générale des Scop License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - <odoo> <data> - <!-- FORM --> - <record model="ir.ui.view" id="cgscop_fc_demande_collective_inherit" > + <!-- FORM --> + <record model="ir.ui.view" id="cgscop_fc_demande_collective_inherit"> <field name="name">cgscop_fc_demande_collective.form.inherit</field> <field name="model">cgscop_form_coop.demande_collective</field> - <field name="inherit_id" ref="cgscop_form_coop.cgscop_fc_demande_collective_form"/> + <field + name="inherit_id" + ref="cgscop_form_coop.cgscop_fc_demande_collective_form" + /> <field name="arch" type="xml"> <!-- Ajoute l'onglet Documents dans la vue --> - <notebook position="inside"> - <page string="Documents" attrs="{'invisible': [('id', '=', False)]}" > - <field name="fc_cmis_folder" - canCreateFolder="0" - canImportNewVersion="1" - canUpdate="1" - canCopyCutPaste="1" - canRename="1" - /> + <notebook position="inside"> + <page + string="Documents" + attrs="{'invisible': [('id', '=', False)]}" + > + <field + name="fc_cmis_folder" + canCreateFolder="0" + canImportNewVersion="1" + canUpdate="1" + canCopyCutPaste="1" + canRename="1" + /> </page> </notebook> </field> diff --git a/views/cgscop_form_coop_demande_views.xml b/views/cgscop_form_coop_demande_views.xml index a52fbdd97c8d16e887af461a9b1b0e250b8851ad..c7a43eddc309a2b0c17e449e8a32c7ef69da8067 100644 --- a/views/cgscop_form_coop_demande_views.xml +++ b/views/cgscop_form_coop_demande_views.xml @@ -1,31 +1,35 @@ -<?xml version="1.0"?> -<!-- Copyright 2019 Le Filament - License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - -<odoo> - <data> - - <!-- FORM --> - <record model="ir.ui.view" id="cgscop_fc_demande_inherit" > - <field name="name">cgscop_fc_demande.form.inherit</field> - <field name="model">cgscop_form_coop.demande</field> - <field name="inherit_id" ref="cgscop_form_coop.cgscop_fc_demande_form"/> - <field name="arch" type="xml"> - <!-- Ajoute l'onglet Documents dans la vue --> - <notebook position="inside"> - <page string="Documents" attrs="{'invisible': [('id', '=', False)]}" > - <field name="fond_annee_char" invisible="1"/> - <field name="fc_cmis_folder" - canCreateFolder="0" - canImportNewVersion="1" - canUpdate="1" - canCopyCutPaste="1" - canRename="1" - /> - </page> - </notebook> - </field> - </record> - - </data> -</odoo> +<?xml version="1.0" ?> +<!-- Copyright 2020 Le Filament + Copyright 2020 Confédération Générale des Scop + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> +<odoo> + <data> + + <!-- FORM --> + <record model="ir.ui.view" id="cgscop_fc_demande_inherit"> + <field name="name">cgscop_fc_demande.form.inherit</field> + <field name="model">cgscop_form_coop.demande</field> + <field name="inherit_id" ref="cgscop_form_coop.cgscop_fc_demande_form" /> + <field name="arch" type="xml"> + <!-- Ajoute l'onglet Documents dans la vue --> + <notebook position="inside"> + <page + string="Documents" + attrs="{'invisible': [('id', '=', False)]}" + > + <field name="fond_annee_char" invisible="1" /> + <field + name="fc_cmis_folder" + canCreateFolder="0" + canImportNewVersion="1" + canUpdate="1" + canCopyCutPaste="1" + canRename="1" + /> + </page> + </notebook> + </field> + </record> + + </data> +</odoo> diff --git a/views/cmis_backend.xml b/views/cmis_backend.xml index bb5e16a1541d792f16f4def93ecfadd586557ea7..5f513f6d3fb46de4f3611021267e6924f34d4137 100644 --- a/views/cmis_backend.xml +++ b/views/cmis_backend.xml @@ -1,17 +1,17 @@ -<?xml version="1.0"?> -<!-- Copyright 2021 Le Filament +<?xml version="1.0" ?> +<!-- Copyright 2020 Le Filament + Copyright 2020 Confédération Générale des Scop License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - <odoo> <data> <record id="view_cmis_backend_cgscop_form_inherited" model="ir.ui.view"> <field name="name">cmis.backend.cgscop.form</field> <field name="model">cmis.backend</field> - <field name="inherit_id" ref="cmis.cmis_backend_form_view"/> + <field name="inherit_id" ref="cmis.cmis_backend_form_view" /> <field name="arch" type="xml"> <xpath expr="//field[@name='initial_directory_write']" position="after"> - <field name="formcoop_directory_write"/> + <field name="formcoop_directory_write" /> </xpath> </field> </record>