From 48248c0ceb75577ad251dd516a1557e8be4c8991 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Fri, 23 Dec 2022 18:44:08 +0100
Subject: [PATCH] [UPD]Change process adhesion
---
models/res_partner.py | 23 ++++++++++++-----------
views/res_partner.xml | 4 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/models/res_partner.py b/models/res_partner.py
index 121d888..b196353 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 2fc93cc..22c00e0 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"
--
GitLab