diff --git a/models/res_partner.py b/models/res_partner.py index fcbac13b777e3280041be5b4e69169a4d54eb519..361280c6cdd286310f346890130fa739c7822ce2 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -67,8 +67,8 @@ class ScopAlfrescoAdhesionPartner(models.Model): } def check_docs_adhesion(self): - compulsory_docs = self.get_compulsory_docs(True) - missing_docs = self.check_compulsory_docs(True) + compulsory_docs = self.get_compulsory_docs() + missing_docs = self.check_compulsory_docs() html = str() for doc in compulsory_docs: html += "<input type='checkbox'" @@ -90,13 +90,18 @@ class ScopAlfrescoAdhesionPartner(models.Model): # ------------------------------------------------------ # Business method # ------------------------------------------------------ - def get_compulsory_docs(self, is_adhesion=False): + def get_compulsory_docs(self): domain = [ ("coop_type_id", "=", self.cooperative_form_id.id), ("is_compulsory", "=", True), ] - if not is_adhesion: + # Si la coop est en projet de création + if self.project_status == "3_accompagnement": domain += [("type_process", "=", "project")] + # Si la coop est en phase d'adhésion + if self.membership_status == "adhesion": + domain += [("type_process", "=", "adhesion")] + return self.env["scop.adhesion.file"].search(domain) # ------------------------------------------------------ @@ -167,13 +172,13 @@ class ScopAlfrescoAdhesionPartner(models.Model): return res - def check_compulsory_docs(self, is_adhesion=False): + def check_compulsory_docs(self): """ Override function to check docs with cmis query :return: """ errors = list() - compulsory_docs = self.get_compulsory_docs(is_adhesion) + compulsory_docs = self.get_compulsory_docs() loaded_docs = self.env["scop.adhesion.file"].compulsory_doc_cmis_query(self) compulsory_docs_list = compulsory_docs.mapped(