From d57dd05d3e27853450bc509e8e56d7a8c6660c3f Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Tue, 4 Oct 2022 10:16:15 +0200 Subject: [PATCH] [UPD]Change meta data project id --- models/account.py | 2 +- wizard/adefpat_project_justif_zip_wizard.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/account.py b/models/account.py index 558a151..9ba55b4 100644 --- a/models/account.py +++ b/models/account.py @@ -82,7 +82,7 @@ class AccountInvoice(models.Model): 'adefpat:factureStartDate': start_date, 'adefpat:factureEndDate': end_date, 'adefpat:factureTypeConvention': self.type_convention_id.name or "", - 'adefpat:factureProjet': self.project_id.name or "", + 'adefpat:factureProjet': self.project_id.id or "", } else: return { diff --git a/wizard/adefpat_project_justif_zip_wizard.py b/wizard/adefpat_project_justif_zip_wizard.py index 06c6018..2a791a9 100644 --- a/wizard/adefpat_project_justif_zip_wizard.py +++ b/wizard/adefpat_project_justif_zip_wizard.py @@ -71,12 +71,12 @@ class AdefpatProjectJustifZip(models.TransientModel): for project in project_ids: compteur += 1 proj = project.name.replace(" ", "_x0020_").replace("'", "_x0027_") - project_name = project.name.replace("'", "\'") + project_id = project.id path = "PATH:'/app:company_home/st:sites/cm:odoo/cm:documentLibrary/cm:Projets/cm:" + proj json_file.append({ "id": bilan_nb + str(compteur), - "name": project_name, - "description": project_name, + "name": project.name, + "description": project.name, "nodes":[ { "id": bilan_nb + str(compteur) + "1", @@ -141,7 +141,7 @@ class AdefpatProjectJustifZip(models.TransientModel): "query": "(PATH:'/app:company_home/st:sites/cm:odoo/cm:documentLibrary/cm:Factures_x0020_fournisseurs//*') AND (+adefpat:factureEndDate:['" + str( self.period_start) + "' TO '" + str( self.period_end) + "'] OR +adefpat:factureSartDate:['" + str( - self.period_start) + "' TO '" + str(self.period_end) + "']) AND =adefpat:factureProjet:'"+ project_name +"'", + self.period_start) + "' TO '" + str(self.period_end) + "']) AND =adefpat:factureProjet:'"+ project_id +"'", }, }, ]}) -- GitLab