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

[update] membership doc validation

parent f6c9132c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!1[add] merge 14.0 new process adh
# Copyright 2021 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import models
from . import models, wizard
......@@ -68,25 +68,7 @@ class ScopAlfrescoAdhesionPartner(models.Model):
}
def check_docs_adhesion(self):
compulsory_docs = self.get_compulsory_docs()
missing_docs = self.check_compulsory_docs()
html = str()
for doc in compulsory_docs:
html += "<input type='checkbox'"
if doc.name not in missing_docs:
html += "checked"
html += "/> " + doc.name + "<br/>"
local_tz = timezone("Europe/Paris")
utc_tz = timezone("UTC")
html += (
"<hr/>Vérifié le "
+ "<strong>"
+ utc_tz.localize(fields.Datetime.now())
.astimezone(local_tz)
.strftime("%d/%m/%Y à %-H:%M")
+ "</strong>"
)
self.log_missing_docs = html
self.scop_check_docs("adhesion")
# ------------------------------------------------------
# Business method
......@@ -108,6 +90,10 @@ class ScopAlfrescoAdhesionPartner(models.Model):
"""
errors = str()
compulsory_docs = self.get_compulsory_docs(type_process)
# Remove KBIS for registration in progress
if type_process == "project" and self.is_registration_in_progress:
compulsory_docs = compulsory_docs.filtered(lambda d: d.type_doc != "KBI")
# Get loaded docs
loaded_docs = self.compulsory_doc_cmis_query()
errors_complete_docs = self.check_compulsory_docs(compulsory_docs, loaded_docs)
......@@ -238,10 +224,6 @@ class ScopAlfrescoAdhesionPartner(models.Model):
Inherit parent to check documents
"""
res = super(ScopAlfrescoAdhesionPartner, self).scop_sumbit_cg()
# vérification des documents obligatoires
self.scop_check_docs(
"adhesion", "Impossible de transmettre le dossier d'adhésion"
)
return res
# ------------------------------------------------------
......
# Copyright 2021 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import scop_membership_submit_wizard
# © 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
class ScopMembershipSubmitWizard(models.TransientModel):
_inherit = "scop.membership.submit.wizard"
# ------------------------------------------------------
# Compute
# ------------------------------------------------------
def _compute_list_logs(self):
super(ScopMembershipSubmitWizard, self)._compute_list_logs()
# vérification des documents obligatoires
self.partner_id.scop_check_docs(
"adhesion", "Impossible de transmettre le dossier d'adhésion"
)
if not self.list_logs:
self.list_logs = self.partner_id.list_logs
else:
if self.partner_id.list_logs:
self.list_logs = self.partner_id.list_logs + self.list_logs
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