Skip to content
Extraits de code Groupes Projets
Valider d57dd05d rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[UPD]Change meta data project id

parent 055fcbb7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -82,7 +82,7 @@ class AccountInvoice(models.Model): ...@@ -82,7 +82,7 @@ class AccountInvoice(models.Model):
'adefpat:factureStartDate': start_date, 'adefpat:factureStartDate': start_date,
'adefpat:factureEndDate': end_date, 'adefpat:factureEndDate': end_date,
'adefpat:factureTypeConvention': self.type_convention_id.name or "", 'adefpat:factureTypeConvention': self.type_convention_id.name or "",
'adefpat:factureProjet': self.project_id.name or "", 'adefpat:factureProjet': self.project_id.id or "",
} }
else: else:
return { return {
......
...@@ -71,12 +71,12 @@ class AdefpatProjectJustifZip(models.TransientModel): ...@@ -71,12 +71,12 @@ class AdefpatProjectJustifZip(models.TransientModel):
for project in project_ids: for project in project_ids:
compteur += 1 compteur += 1
proj = project.name.replace(" ", "_x0020_").replace("'", "_x0027_") 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 path = "PATH:'/app:company_home/st:sites/cm:odoo/cm:documentLibrary/cm:Projets/cm:" + proj
json_file.append({ json_file.append({
"id": bilan_nb + str(compteur), "id": bilan_nb + str(compteur),
"name": project_name, "name": project.name,
"description": project_name, "description": project.name,
"nodes":[ "nodes":[
{ {
"id": bilan_nb + str(compteur) + "1", "id": bilan_nb + str(compteur) + "1",
...@@ -141,7 +141,7 @@ class AdefpatProjectJustifZip(models.TransientModel): ...@@ -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( "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_start) + "' TO '" + str(
self.period_end) + "'] OR +adefpat:factureSartDate:['" + 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 +"'",
}, },
}, },
]}) ]})
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter