Skip to content
Extraits de code Groupes Projets
Valider 87f09031 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[mig] Migration to 14.0 + add pre-commit changes

parent 0f6de68c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
# 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
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
[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
# 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/
[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
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
# 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"
[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
[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
......@@ -30,4 +30,3 @@ Maintainer
:target: https://le-filament.com
This module is maintained by Le Filament
{
'name': "CG Scop - Alfodoo Partner",
'summary': "Connexion Alfodoo pour les Coopératives",
'author': "Le Filament",
'website': "https://www.le-filament.com",
'version': '12.0.1.0.1',
'license': "AGPL-3",
'depends': [
"name": "CG Scop - Alfodoo Partner",
"summary": "Connexion Alfodoo pour les Coopératives",
"author": "Le Filament",
"website": "https://www.le-filament.com",
"version": "14.0.1.0.0",
"license": "AGPL-3",
"depends": [
"cgscop_alfresco",
"cgscop_partner",
"cmis",
......@@ -14,8 +14,10 @@
"cmis_web",
"lefilament_alfodoo",
],
'data': [
'views/res_partner.xml',
"data": [
"views/res_partner.xml",
],
"external_dependencies": {
"python": ["cmislib"],
},
}
......@@ -3,26 +3,32 @@
import logging
from odoo import api, models
from cmislib.exceptions import (
ContentAlreadyExistsException,
InvalidArgumentException,
ObjectNotFoundException,
UpdateConflictException,
)
from odoo import _, models
from odoo.exceptions import UserError, ValidationError
from odoo.addons.cmis_field import fields
from cmislib.exceptions import ContentAlreadyExistsException, \
ObjectNotFoundException, UpdateConflictException, InvalidArgumentException
_logger = logging.getLogger(__name__)
ALFRESCO_TRACKED_FIELDS = ['name', 'id', 'siret', 'member_number', 'ur_id']
ALFRESCO_TRACKED_FIELDS = ["name", "id", "siret", "member_number", "ur_id"]
class AlfodooResPartner(models.Model):
_name = 'res.partner'
_inherit = ['res.partner', 'cgscop.alfresco']
_name = "res.partner"
_inherit = ["res.partner", "cgscop.alfresco"]
partner_cmis_folder = fields.CmisFolder(
allow_create=True,
allow_delete=False,
create_parent_get='_get_parent_path',
create_properties_get='_get_folder_properties',
create_parent_get="_get_parent_path",
create_properties_get="_get_folder_properties",
)
# ------------------------------------------------------
......@@ -33,9 +39,10 @@ class AlfodooResPartner(models.Model):
Défini le répertoire parent :
le répertoire configuré par défaut dans le backend
"""
path_parts = backend.initial_directory_write.split('/')
path_parts = backend.initial_directory_write.split("/")
parent_cmis_object = backend.get_folder_by_path_parts(
path_parts, create_if_not_found=True)
path_parts, create_if_not_found=True
)
path = dict.fromkeys(self.ids, parent_cmis_object)
return path
......@@ -45,22 +52,23 @@ class AlfodooResPartner(models.Model):
"""
return {
self.id: {
'cmis:secondaryObjectTypeIds': [
'P:crm:organisme', 'P:up:UploadFolder', 'P:cm:titled'
"cmis:secondaryObjectTypeIds": [
"P:crm:organisme",
"P:up:UploadFolder",
"P:cm:titled",
],
'up:allowedTypes': 'crm:document',
'crm:raisonSociale': self.name,
'crm:siret': self.siret if self.siret else '',
'crm:numAdherent': self.member_number if self.member_number else '',
'crm:id': str(self.id),
'crm:ur': str(self.ur_id.id),
"up:allowedTypes": "crm:document",
"crm:raisonSociale": self.name,
"crm:siret": self.siret if self.siret else "",
"crm:numAdherent": self.member_number if self.member_number else "",
"crm:id": str(self.id),
"crm:ur": str(self.ur_id.id),
}
}
# ------------------------------------------------------
# Override ORM
# ------------------------------------------------------
@api.multi
def write(self, vals):
"""Surcharge la fonction write() pour mettre à jour
la raison sociale, le nom, le siret, l'id Odoo ou le
......@@ -69,8 +77,8 @@ class AlfodooResPartner(models.Model):
change_fields = vals.keys()
# check intersection
is_alfresco_field = [
value for value in change_fields if value in ALFRESCO_TRACKED_FIELDS]
value for value in change_fields if value in ALFRESCO_TRACKED_FIELDS
]
# Ecriture des nouvelles valeurs
result = super(AlfodooResPartner, self).write(vals)
......@@ -80,30 +88,39 @@ class AlfodooResPartner(models.Model):
if record.is_cooperative and record.partner_cmis_folder:
if is_alfresco_field:
try:
backend = self._fields['partner_cmis_folder']
properties = self._get_folder_properties(
record, backend).get(record.id)
if vals.get('name', False):
properties.update({'cmis:name': record.name})
backend = self._fields["partner_cmis_folder"]
properties = self._get_folder_properties(record, backend).get(
record.id
)
if vals.get("name", False):
properties.update({"cmis:name": record.name})
folder = backend.get_cmis_object(record)
folder.updateProperties(properties)
except (ContentAlreadyExistsException, ObjectNotFoundException,
UpdateConflictException, InvalidArgumentException) as e:
except (
ContentAlreadyExistsException,
ObjectNotFoundException,
UpdateConflictException,
InvalidArgumentException,
) as e:
_logger.error(e)
raise ValidationError("""Erreur de mise à jour Alfresco :
raise ValidationError(
_(
"""Erreur de mise à jour Alfresco :
- Code : %s
- Url : %s
- Détail : %s""" % (e.status, e.url, e.details))
- Détail : %s"""
)
% (e.status, e.url, e.details)
)
except Exception as e:
raise ValidationError(e)
return result
@api.multi
def unlink(self):
for partner in self:
if partner.partner_cmis_folder:
try:
backend = self._fields['partner_cmis_folder']
backend = self._fields["partner_cmis_folder"]
folder = backend.get_cmis_object(partner)
folder.delete()
except Exception as e:
......@@ -115,15 +132,13 @@ class AlfodooResPartner(models.Model):
# ------------------------------------------------------
# Common Functions
# ------------------------------------------------------
@api.multi
def create_cmis_folder(self):
for partner in self:
if partner.partner_cmis_folder:
raise UserError("Le partenaire a déjà un dossier Alfresco associé")
raise UserError(_("Le partenaire a déjà un dossier Alfresco associé"))
else:
try:
partner._fields['partner_cmis_folder'].create_value(
partner)
return partner.partner_cmis_folder
partner._fields["partner_cmis_folder"].create_value(partner)
# return partner.partner_cmis_folder
except Exception as e:
return e.name
static/description/icon.png

8,95 ko | W: | H:

static/description/icon.png

15,5 ko | W: | H:

static/description/icon.png
static/description/icon.png
static/description/icon.png
static/description/icon.png
  • 2-up
  • Swipe
  • Onion skin
<?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
<data>
......@@ -13,8 +12,13 @@
<field name="arch" type="xml">
<!-- Ajoute l'onglet Documents dans la vue coopérative -->
<xpath expr="//notebook" position="inside">
<page string="Documents" groups="base.group_user" attrs="{'invisible': [('is_cooperative', '=', False)]}">
<field name="partner_cmis_folder"
<page
string="Documents"
groups="base.group_user"
attrs="{'invisible': [('is_cooperative', '=', False)]}"
>
<field
name="partner_cmis_folder"
canCreateFolder="0"
canImportNewVersion="0"
canUpdate="0"
......@@ -24,7 +28,8 @@
{'name': 'crm:type', 'type': 'selection', 'label': 'Type', 'query': 'SELECT v1.classement:value1, v2.classement:value2 FROM classement:datalist4 as d JOIN classement:value1Aspect as v1 on d.cmis:objectId = v1.cmis:objectId JOIN classement:value2Aspect as v2 on d.cmis:objectId = v2.cmis:objectId JOIN classement:value3Aspect as v3 on d.cmis:objectId = v3.cmis:objectId WHERE v3.classement:value3 = \&quot;STD\&quot;', 'selectionValue': 'v2.classement:value2', 'selectionText': 'v1.classement:value1', 'required': '1'},
{'name': 'crm:annee', 'type': 'number', 'label': 'Année', 'required': '1', 'pattern': '[0-9]{4}'},
{'name': 'cmis:objectTypeId', 'value': 'D:crm:document', 'label': 'ObjectType'},
{'name': 'crm:contexte', 'value': 'STD', 'label': 'Contexte'}]"/>
{'name': 'crm:contexte', 'value': 'STD', 'label': 'Contexte'}]"
/>
</page>
</xpath>
</field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter