diff --git a/models/res_partner.py b/models/res_partner.py index 121d888c6b72618768ae74a3464af0e977f6c84c..b196353693cb054317a08e03ae0dab3afaf64b0f 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() - missing_docs = self.check_compulsory_docs() + compulsory_docs = self.get_compulsory_docs(True) + missing_docs = self.check_compulsory_docs(True) html = str() for doc in compulsory_docs: html += "<input type='checkbox'" @@ -90,13 +90,14 @@ class ScopAlfrescoAdhesionPartner(models.Model): # ------------------------------------------------------ # Business method # ------------------------------------------------------ - def get_compulsory_docs(self): - return self.env["scop.adhesion.file"].search( - [ - ("coop_type_id", "=", self.cooperative_form_id.id), - ("is_compulsory", "=", True), - ] - ) + def get_compulsory_docs(self, is_adhesion=False): + domain = [ + ("coop_type_id", "=", self.cooperative_form_id.id), + ("is_compulsory", "=", True), + ] + if not is_adhesion: + domain += ("type_process", "=", "project") + return self.env["scop.adhesion.file"].search(domain) # ------------------------------------------------------ # Override parent @@ -166,13 +167,13 @@ class ScopAlfrescoAdhesionPartner(models.Model): return res - def check_compulsory_docs(self): + def check_compulsory_docs(self, is_adhesion=False): """ Override function to check docs with cmis query :return: """ 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) compulsory_docs_list = compulsory_docs.mapped( diff --git a/views/res_partner.xml b/views/res_partner.xml index 2fc93ccfc63790f28a5221ac0851b2441d0ee412..22c00e03102cffa03639fe20ac18739592b879a1 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -22,12 +22,12 @@ type="object" name="check_docs_adhesion" class="btn-info mb-10" - attrs="{'invisible': [('project_status', '!=', '4_adhesion')]}" + attrs="{'invisible': [('membership_status', '!=', 'adhesion')]}" /> <div class="alert alert-info mt16" 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 class="o_field_header"