diff --git a/models/account.py b/models/account.py index d4571a0d3ad8ffa33647fa0e04f9409ba3aa9b63..61d44b42623b2bfeff7af6ba1ec16a37726989bb 100644 --- a/models/account.py +++ b/models/account.py @@ -90,5 +90,6 @@ class AccountInvoice(models.Model): 'adefpat:factureStartDate': fields.Datetime.to_datetime( self.date_invoice).isoformat(), 'adefpat:factureTypeConvention': self.type_convention_id.name or "", + 'adefpat:factureProjet': str(self.project_id.id) or "", } diff --git a/wizard/adefpat_project_justif_zip_wizard.py b/wizard/adefpat_project_justif_zip_wizard.py index 2438ef18e183377cf2719ad546ae5fea3e476cc0..89e5fcd5d04334c2fa48767c7b3e25d5869cb3c2 100644 --- a/wizard/adefpat_project_justif_zip_wizard.py +++ b/wizard/adefpat_project_justif_zip_wizard.py @@ -33,9 +33,7 @@ class AdefpatProjectJustifZip(models.TransientModel): json_file = [] json_file_proj = self.build_json_project("11") json_file.append(json_file_proj) - json_file_fc = self.build_json_file_facture_client("31") - json_file.append(json_file_fc) - json_file_frais = self.build_json_file_expense_zip("41") + json_file_frais = self.build_json_file_expense_zip("21") json_file.append(json_file_frais) virtual_json = { @@ -144,6 +142,17 @@ class AdefpatProjectJustifZip(models.TransientModel): self.period_start) + "' TO '" + str(self.period_end) + "']) AND =adefpat:factureProjet:'"+ str(project_id) +"'", }, }, + { + "id": bilan_nb + str(compteur) + "8", + "name": "Factures Clients", + "description": "Factures Clients", + "search": { + "language": "fts-alfresco", + "query": "(PATH:'/app:company_home/st:sites/cm:odoo/cm:documentLibrary/cm:Factures_x0020_clients//*') AND (+adefpat:factureStartDate:['" + str( + self.period_start) + "' TO '" + str( + self.period_end) +"']) AND =adefpat:factureProjet:'"+ str(project_id) +"'", + }, + }, ]}) virtual_json = {