diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 70412f9a883abfa95493bcd93a4a6f183a91270d..f96d0a76d14d9db1b8ff3ed4fbe0fc49f286c32c 100644 --- a/models/lefilament_tdb.py +++ b/models/lefilament_tdb.py @@ -116,6 +116,7 @@ class LeFilamentTdb(models.Model): 'capital': 0, 'date_maj': 0, 'a_encaisser': 0, + 'a_payer': 0, } self._cr.execute(""" @@ -123,6 +124,7 @@ class LeFilamentTdb(models.Model): (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) and date < date_trunc('year', current_date + interval '1' year) ) as facture, (select sum(residual_company_signed) from account_invoice where state!='draft' and type='out_invoice' ) as a_encaisser, + (select sum(residual_company_signed) from account_invoice where state!='draft' and type='in_invoice' ) as a_payer, (select sum(planned_revenue*probability/100) from crm_lead where active=True and (date_deadline < date_trunc('year', current_date + interval '1' year) or date_deadline is null) ) as pipe, (select sum(planned_revenue*probability/100) from crm_lead where active=True and date_deadline >= date_trunc('year', current_date + interval '1' year) ) as pipe_n1, (select sum(planned_revenue*probability/100) from crm_lead where active=True and probability=100 and (date_deadline < date_trunc('year', current_date + interval '1' year) or date_deadline is null) ) as pipe_win, @@ -146,6 +148,8 @@ class LeFilamentTdb(models.Model): res['facture'] =+ datas[0]['facture'] if datas[0]['a_encaisser']: res['a_encaisser'] =+ datas[0]['a_encaisser'] + if datas[0]['a_payer']: + res['a_encaisser'] =+ datas[0]['a_payer'] if datas[0]['pipe']: res['pipe'] =+ datas[0]['pipe'] if datas[0]['pipe_win']: diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css index f5229b6b5285e198f22cce0e466ae53de2d93e66..1f50453a072fe6dae2bd1c227dd2a67a6c580e62 100644 --- a/static/src/css/lefilament_tdb.css +++ b/static/src/css/lefilament_tdb.css @@ -32,6 +32,7 @@ .yeardashboard h3 { margin: 10px 15px; font-size: 20px; font-weight: 400; border-bottom: 1px solid #ddd; color: #5E6975; } .card { background-color: #fff; color: #73879C; padding: 20px; margin: 10px 0; } .card a { color: inherit; } +.card-number a { color: inherit; } .card-half { float: left; width: 50%; } .card-header { margin: 0!important; } p.card-maj { margin: 0px; font-size: 10px; font-style: italic; font-weight: 300; } diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 7888c99e7238fca0b14fd3910710546fe42e1e4b..be9032c5189730ae906bad94d1ccfac479bca45c 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -190,14 +190,24 @@ </p> </div> </div> - <div class="col-xs-12"> - <div class="card"> - <p class="card-header">Facturé non encaissé</p> - <p class="card-number"> - <a id="facture_non_encaisse"> - <t t-esc="widget.render_monetary(widget.values.a_encaisser)"></t> - </a> - </p> + <div class="col-xs-12 dashboard-tab"> + <ul class="nav nav-tabs" id="tab3"> + <li class="active"><a data-toggle="tab" href="#non_encaisse">Facturé non encaissé</a></li> + <li><a data-toggle="tab" href="#fournisseur">Fournisseurs</a></li> + </ul> + <div class="tab-content card-tab" id="myTab3Content"> + <div id="non_encaisse" class="tab-pane fade active in"> + <p class="card-number"> + <a id="facture_non_encaisse"> + <t t-esc="widget.render_monetary(widget.values.a_encaisser)"></t> + </a> + </p> + </div> + <div id="fournisseur" class="tab-pane fade"> + <p class="card-number"> + <t t-esc="widget.render_monetary(widget.values.a_payer)"></t> + </p> + </div> </div> </div> <div class="col-xs-12 dashboard-tab">