diff --git a/models/res_partner.py b/models/res_partner.py index 0a26d9239ae6a8ee5533e9aa84b399dcf8b1a953..40b3b4daffcac0d5d4adee54c77aaa873ffee825 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -228,9 +228,15 @@ class ScopAlfrescoAdhesionPartner(models.Model): ]) loaded_docs = self.env['scop.adhesion.file'].\ compulsory_doc_cmis_query(self) - # TODO : Check diff between compulsory docs and loaded docs + + compulsory_docs_list = compulsory_docs.mapped(lambda d: {'name': d.name, 'metadata': d.type_doc}) + loaded_docs_list = list(map(lambda d: d.properties.get('crm:type'), loaded_docs)) + for madatory_doc in compulsory_docs_list: + if madatory_doc.get('metadata') not in loaded_docs_list: + errors += "<li>" + madatory_doc.get('name') + "</li>" + if errors: - res = '---\n Documents manquants :\n' + errors + res = '<hr/><strong>Documents manquants :</strong><u:>' + errors + '</ul>' return res else: return str() diff --git a/models/scop_adhesion_file.py b/models/scop_adhesion_file.py index 17776d8e04aae180b2f575f5c9e909243b049d90..6e81a1f04627e21d0f2d950ce1d50f9d1a8af7d0 100644 --- a/models/scop_adhesion_file.py +++ b/models/scop_adhesion_file.py @@ -9,7 +9,6 @@ class ScopAdhesionFiles(models.Model): _description = 'Documents pour adhésion des coops' type_doc = fields.Char('Méta : Type') - contexte_doc = fields.Char('Méta : Contexte') # ------------------------------------------------------ # Business method @@ -18,14 +17,14 @@ class ScopAdhesionFiles(models.Model): backend = self.env['cmis.backend'].search([]) backend.ensure_one() cmis_client = backend.get_cmis_client() - # TODO : Write correct query query = (""" SELECT * FROM crm:document as d JOIN crm:organisme as o ON d.cmis:objectId = o.cmis:objectId WHERE o.crm:id = '%s'""" % partner.id) try: doc = cmis_client.getDefaultRepository().query(query) - return doc._results + result = doc.getResults() + return result except Exception as e: raise exceptions.Warning( "Impossible de vérifier les documents d'adhésion" diff --git a/views/scop_adhesion_file.xml b/views/scop_adhesion_file.xml index 37830e6642526bfc250bbe999a3407a9a919adc3..258558a27f1f4f2d7438f6f6c15448f0ff1636fd 100755 --- a/views/scop_adhesion_file.xml +++ b/views/scop_adhesion_file.xml @@ -12,7 +12,6 @@ <field name="arch" type="xml"> <xpath expr="//tree" position="inside"> <field name="type_doc"/> - <field name="contexte_doc"/> </xpath> </field> </record>