diff --git a/controllers/main.py b/controllers/main.py index dcde63c486e6083d3667bdebc1058284b048930a..e23e975179e5c5f8454737986587e996d6f5f99b 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -50,13 +50,21 @@ class ExportJournalCg(http.Controller): company_id = request.env["res.company"].browse(int(company_id)) default_receivable_account_id = request.env.ref("l10n_fr.1_fr_pcg_recv") contribution_cg_id = company_id.contribution_cg_id - suspense_account_ids = request.env["account.journal"].search([ - ("company_id", "=", company_id.id), - ("type", "=", "bank"), - ]).mapped("suspense_account_id") - suspense_move_ids = request.env["account.move.line"].search([ - ("account_id", "in", suspense_account_ids.ids) - ]).mapped("move_id") + suspense_account_ids = ( + request.env["account.journal"] + .search( + [ + ("company_id", "=", company_id.id), + ("type", "=", "bank"), + ] + ) + .mapped("suspense_account_id") + ) + suspense_move_ids = ( + request.env["account.move.line"] + .search([("account_id", "in", suspense_account_ids.ids)]) + .mapped("move_id") + ) # Journaux des UR et Fédé # TODO: vérifier l'export des comptes de banque en sortie pour UR et Fédé @@ -71,7 +79,7 @@ class ExportJournalCg(http.Controller): domain = [ ("company_id", "=", company_id.id), ("parent_state", "=", "posted"), - ("move_id", "not in", suspense_move_ids.ids) + ("move_id", "not in", suspense_move_ids.ids), ] if date_start and date_end: domain += [ diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py index 0658b5dcb6cfa5dd2815cc9ab44a636dba9f74eb..5f69bf56ca1a0a015c041c6bf399184e70b749a0 100644 --- a/models/scop_bordereau_cg.py +++ b/models/scop_bordereau_cg.py @@ -920,9 +920,7 @@ class Bordereau(models.Model): price_unit = amount / 4 # Specific CAE calculation : to be deleted when 2022 is generated - if ( - type_contribution == type_contrib_cae - ): + if type_contribution == type_contrib_cae: Invoice.create( { "partner_id": partner.id, diff --git a/templates/report_scop_bordereau_payments.xml b/templates/report_scop_bordereau_payments.xml index 20eb252b3d40d1ee0e6c8819608dd53c55affeeb..754dd2732392873f76ec9be196155b4e8ac076b2 100644 --- a/templates/report_scop_bordereau_payments.xml +++ b/templates/report_scop_bordereau_payments.xml @@ -271,15 +271,15 @@ > <t t-if="payment.credit > 0"> <t - t-esc="payment.credit" - t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" - /> + t-esc="payment.credit" + t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" + /> </t> <t t-else=""> <t - t-esc="-payment.debit" - t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" - /> + t-esc="-payment.debit" + t-options="{'widget': 'monetary', 'display_currency': o.company_id.currency_id}" + /> </t> </td> </tr>