diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 879e738bbc7562751bf1c4d23b0a6f199adea1e6..20e54bba05f1dad5e5cb0f4bc2d06b2ca04bb22e 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -33,7 +33,7 @@ class LeFilamentTdb(models.Model): date_tdb = datetime.strptime(record.date_tdb, '%Y-%m-%d') ############## CA ################ - # CA TOTAL + # FACTURÉ self.env.cr.execute("select sum(amount_untaxed) from account_invoice where state!='draft' and type='out_invoice' and date >= date_trunc('month', %s) and date < date_trunc('month', %s + interval '1' month);", (date_tdb, date_tdb) ) ca_mois = self.env.cr.fetchone()[0] @@ -111,6 +111,7 @@ class LeFilamentTdb(models.Model): SELECT (select count(*) from account_invoice) as id, (select sum(amount_untaxed) from account_invoice where state!='draft' and type='out_invoice' and date >= date_trunc('year', current_date) ) as facture, + (select sum(residual_company_signed) from account_invoice where state!='draft' and type='out_invoice' and date >= date_trunc('year', current_date) ) as a_encaisser, (select sum(planned_revenue*probability/100) from crm_lead where active=True) as pipe, (select sum(amount) from account_bank_statement_line ) as tresorerie, (select sum(amount) from account_bank_statement_line where amount > 0 and date >= date_trunc('year', current_date) ) as entree, @@ -120,6 +121,7 @@ class LeFilamentTdb(models.Model): datas = cr.dictfetchall() res['facture'] =+ datas[0]['facture'] + res['a_encaisser'] =+ datas[0]['a_encaisser'] res['pipe'] =+ datas[0]['pipe'] res['tresorerie'] =+ datas[0]['tresorerie'] res['entree'] =+ datas[0]['entree'] diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js index eccace878527dec186399110b6dd209838793855..6b310c2e91dd2cd3d4f32d3966227ceb6d8cbebe 100644 --- a/static/src/js/dashboard_year.js +++ b/static/src/js/dashboard_year.js @@ -28,6 +28,7 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) { .call('retrieve_datas_dashboard', []) .then(function(results) { self.values = results; + console.log(self.values); self.progress = results.facture / results.target; deferred.resolve(); }); diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 5bb3b4393de47c8715a613e9b78ffdaa0b9a9572..cd17d1619021f41a58c9aaea6ea9b29ce1409a48 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -100,6 +100,14 @@ </p> </div> </div> + <div class="col-xs-12"> + <div class="card"> + <p class="card-header">Reste à encaisser</p> + <p class="card-number"> + <t t-esc="widget.render_monetary(widget.values.a_encaisser)"></t> + </p> + </div> + </div> </div> <!-- COLONNE 2 --> <div class="col-xs-6 col-sm-4">