Skip to content
Extraits de code Groupes Projets
Valider 48248c0c rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[UPD]Change process adhesion

parent bf96bbee
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
...@@ -67,8 +67,8 @@ class ScopAlfrescoAdhesionPartner(models.Model): ...@@ -67,8 +67,8 @@ class ScopAlfrescoAdhesionPartner(models.Model):
} }
def check_docs_adhesion(self): def check_docs_adhesion(self):
compulsory_docs = self.get_compulsory_docs() compulsory_docs = self.get_compulsory_docs(True)
missing_docs = self.check_compulsory_docs() missing_docs = self.check_compulsory_docs(True)
html = str() html = str()
for doc in compulsory_docs: for doc in compulsory_docs:
html += "<input type='checkbox'" html += "<input type='checkbox'"
...@@ -90,13 +90,14 @@ class ScopAlfrescoAdhesionPartner(models.Model): ...@@ -90,13 +90,14 @@ class ScopAlfrescoAdhesionPartner(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Business method # Business method
# ------------------------------------------------------ # ------------------------------------------------------
def get_compulsory_docs(self): def get_compulsory_docs(self, is_adhesion=False):
return self.env["scop.adhesion.file"].search( domain = [
[
("coop_type_id", "=", self.cooperative_form_id.id), ("coop_type_id", "=", self.cooperative_form_id.id),
("is_compulsory", "=", True), ("is_compulsory", "=", True),
] ]
) if not is_adhesion:
domain += ("type_process", "=", "project")
return self.env["scop.adhesion.file"].search(domain)
# ------------------------------------------------------ # ------------------------------------------------------
# Override parent # Override parent
...@@ -166,13 +167,13 @@ class ScopAlfrescoAdhesionPartner(models.Model): ...@@ -166,13 +167,13 @@ class ScopAlfrescoAdhesionPartner(models.Model):
return res return res
def check_compulsory_docs(self): def check_compulsory_docs(self, is_adhesion=False):
""" """
Override function to check docs with cmis query Override function to check docs with cmis query
:return: :return:
""" """
errors = list() errors = list()
compulsory_docs = self.get_compulsory_docs() compulsory_docs = self.get_compulsory_docs(is_adhesion)
loaded_docs = self.env["scop.adhesion.file"].compulsory_doc_cmis_query(self) loaded_docs = self.env["scop.adhesion.file"].compulsory_doc_cmis_query(self)
compulsory_docs_list = compulsory_docs.mapped( compulsory_docs_list = compulsory_docs.mapped(
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
type="object" type="object"
name="check_docs_adhesion" name="check_docs_adhesion"
class="btn-info mb-10" class="btn-info mb-10"
attrs="{'invisible': [('project_status', '!=', '4_adhesion')]}" attrs="{'invisible': [('membership_status', '!=', 'adhesion')]}"
/> />
<div <div
class="alert alert-info mt16" class="alert alert-info mt16"
role="alert" role="alert"
attrs="{'invisible':['|', '|', ('write_date', '=', False), ('log_missing_docs', '=', False), ('project_status', '!=', '4_adhesion')]}" attrs="{'invisible':['|', '|', ('write_date', '=', False), ('log_missing_docs', '=', False), ('membership_status', '!=', 'adhesion')]}"
> >
<field <field
class="o_field_header" class="o_field_header"
......
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