diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 7601896690413884c4447a6abf083efa79828fb4..3845edffdec49fb6733b2f7af67b90ed95e7bba2 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -225,6 +225,12 @@ class LeFilamentTdb(models.Model): limit=1 ).date res['tresorerie'] = sum(self.env['account.bank.statement.line'].search([]).mapped('amount')) + res['treso_by_bank'] = self.env['account.bank.statement.line'].read_group( + domain=[], + fields=['journal_id', 'amount'], + groupby=['journal_id'], + orderby='journal_id' + ) res['entree'] = sum(self.env['account.bank.statement.line'].search([ ('amount', '>', 0), ('date', '>', fiscal_year), diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 1e641f178eb9f7418160d5a56316adea5701be88..2673934364a375d7e3095b8dd977849c40c76bec 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -149,39 +149,43 @@ <div class="col-xs-12 col-sm-6 col-md-4 tresorerie"> <h3>Trésorerie</h3> <!-- Tréso --> - <div class="col-xs-12"> - <div class="card"> - <div class="card-body"> - <h5 class="card-title">Trésorerie</h5> - <p class="card-maj">Denière mise à jour le <t - t-esc="widget.render_date(widget.values.date_maj)" - /></p> + <div class="col-xs-12 dashboard-tab"> + <ul class="nav nav-tabs" id="tresoTab"> + <li class="nav-item"> + <a class="nav-link active" data-toggle="tab" href="#treso">Trésorerie</a> + </li> + <li class="nav-item"> + <a class="nav-link" data-toggle="tab" href="#by-bank">Solde banques</a> + </li> + </ul> + <div class="tab-content card-tab" id="tresoContent"> + <div id="treso" class="tab-pane fade show active in"> + <p class="card-maj">Denière mise à jour le <t t-esc="widget.render_date(widget.values.date_maj)"/></p> <p class="card-number"> - <a id="releve"> - <strong><t - t-esc="widget.render_monetary(widget.values.tresorerie)" - /></strong> + <a id="releve"><strong><t t-esc="widget.render_monetary(widget.values.tresorerie)"/></strong> </a> </p> </div> + <div id="by-bank" class="tab-pane fade"> + <table class="table table-striped table-sm table-bordered table-hover"> + <t t-foreach="widget.values.treso_by_bank" t-as="bank"> + <tr> + <td><t t-esc="bank.journal_id[1]"/></td> + <td class="text-right"><t t-esc="widget.render_monetary(bank.amount)"/></td> + </tr> + </t> + </table> + </div> </div> </div> <!-- Non encaissé / Du --> <div class="col-xs-12 dashboard-tab"> <ul class="nav nav-tabs" id="tab3"> <li class="nav-item"> - <a - class="nav-link active" - data-toggle="tab" - href="#non_encaisse" - >Facturé non encaissé</a> + <a class="nav-link active" data-toggle="tab" href="#non_encaisse">Facturé non encaissé</a> </li> <li class="nav-item"> - <a - class="nav-link" - data-toggle="tab" - href="#fournisseur" - >Fournisseurs</a> + <a class="nav-link" data-toggle="tab" href="#fournisseur">Fournisseurs</a> </li> </ul> <div class="tab-content card-tab" id="myTab3Content">