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

[fix] error partner creation followers

parent f881b29f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -6,8 +6,6 @@ exclude: |
^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
......@@ -28,7 +26,7 @@ repos:
language: fail
files: "\\.rej$"
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 7d8a9f9ad73db0976fb03cbee43d953bc29b89e9
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
......@@ -46,12 +44,11 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
additional_dependencies: ["click==8.0.4"]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
rev: v2.6.2
hooks:
- id: prettier
name: prettier (with plugin-xml)
......@@ -62,7 +59,7 @@ repos:
- --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
rev: v8.15.0
hooks:
- id: eslint
verbose: true
......@@ -70,7 +67,7 @@ repos:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.2.0
hooks:
- id: trailing-whitespace
# exclude autogenerated files
......@@ -92,12 +89,12 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.2
rev: v2.32.1
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.10.1
hooks:
- id: isort
name: isort except __init__.py
......@@ -105,13 +102,13 @@ repos:
- --settings=.
exclude: /__init__\.py$
- repo: https://gitlab.com/PyCQA/flake8
rev: 3.8.3
rev: 3.9.2
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
rev: v2.11.1
hooks:
- id: pylint
name: pylint with optional checks
......@@ -120,7 +117,7 @@ repos:
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- pylint-odoo==5.0.5
- id: pylint
name: pylint with mandatory checks
args:
......
......@@ -785,10 +785,13 @@ class ScopPartner(models.Model):
partner._create_period(partner)
# Ajout des followers de la fiche
partners_to_subscribe = [
partner.followup_delegate_id.partner_id.id,
partner.creation_delegate_id.partner_id.id,
]
partners_to_subscribe = []
if partner.followup_delegate_id != partner.create_uid:
partners_to_subscribe.append(partner.followup_delegate_id.partner_id.id)
if partner.creation_delegate_id != partner.create_uid:
partners_to_subscribe.append(partner.creation_delegate_id.partner_id.id)
if partners_to_subscribe:
partner.message_subscribe(partner_ids=partners_to_subscribe)
return result
......@@ -817,13 +820,6 @@ class ScopPartner(models.Model):
if not partner.scop_period_ids:
partner._create_period(partner)
# Ajout des followers de la fiche
for partner in partners:
partners_to_subscribe = [
partner.followup_delegate_id.partner_id.id,
partner.creation_delegate_id.partner_id.id,
]
partner.message_subscribe(partner_ids=partners_to_subscribe)
return partners
@api.model
......
......@@ -124,14 +124,10 @@ class ScopPartnerStaff(models.Model):
Interdit la sélection questionnaire ou questionnaire inscription
sur l'interface
"""
if (
self.type_entry
in (
if self.type_entry in (
"questionnaire",
"questionnaire_inscription",
)
and not self.env.user.has_group("cgscop_partner.group_cg_administrative")
):
) and not self.env.user.has_group("cgscop_partner.group_cg_administrative"):
raise ValidationError(
_('Vous ne pouvez choisir que des types "Régularisation".')
)
......
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