From c0c3e03b1361316a5cdcf601405d6125a448015c Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Thu, 20 Jul 2017 13:00:39 +0200
Subject: [PATCH] [add] date derniere maj
---
models/lefilament_tdb.py | 5 ++++-
static/src/css/lefilament_tdb.css | 1 +
static/src/js/dashboard_year.js | 5 +++++
static/src/xml/lefilament_tdb.xml | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index 9ce5408..124fb8d 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -113,6 +113,7 @@ class LeFilamentTdb(models.Model):
'target': 100000,
'cca': 0,
'capital': 0,
+ 'date_maj': 0,
}
cr.execute("""
SELECT
@@ -121,7 +122,8 @@ class LeFilamentTdb(models.Model):
(select sum(residual_company_signed) from account_invoice where state!='draft' and type='out_invoice' ) as a_encaisser,
(select sum(planned_revenue*probability/100) from crm_lead where active=True) as pipe,
(select sum(planned_revenue*probability/100) from crm_lead where active=True and probability=100) as pipe_win,
- (select sum(planned_revenue*probability/100) from crm_lead where active=True and probability!=100) as pipe_to_win,
+ (select sum(planned_revenue*probability/100) from crm_lead where active=True and probability!=100) as pipe_to_win,
+ (select date from account_bank_statement ORDER BY ID DESC LIMIT 1) as date_maj,
(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,
(select sum(amount) from account_bank_statement_line where amount < 0 and date >= date_trunc('year', current_date) ) as sortie,
@@ -142,6 +144,7 @@ class LeFilamentTdb(models.Model):
res['pipe_win'] =+ datas[0]['pipe_win']
res['pipe_to_win'] =+ datas[0]['pipe_to_win']
res['tresorerie'] =+ datas[0]['tresorerie']
+ res['date_maj'] = datas[0]['date_maj']
res['entree'] =+ datas[0]['entree']
res['sortie'] =+ datas[0]['sortie']
res['variation'] =+ datas[0]['variation']
diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css
index a96d36f..afbad74 100644
--- a/static/src/css/lefilament_tdb.css
+++ b/static/src/css/lefilament_tdb.css
@@ -34,6 +34,7 @@
.card a { color: inherit; }
.card-half { float: left; width: 50%; }
.card-header { margin: 0!important; }
+p.card-maj { margin: 0 0 10px; font-size: 10px; font-style: italic; font-weight: 300; }
.card-number { font-size: 30px; font-weight: 300; margin: 0!important; font-family: "Helvetica Neue", Helvetica, "Open Sans", Arial, sans-serif; }
.card-tab { background-color: #fff; color: #73879C; padding: 20px; margin: 0px 0 10px; }
.tresorerie .card-number { font-size: 20px; font-weight: 300; }
diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js
index 57d862a..9bc5bff 100644
--- a/static/src/js/dashboard_year.js
+++ b/static/src/js/dashboard_year.js
@@ -128,6 +128,11 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) {
value = value.toLocaleString('fr', { maximumFractionDigits: 0 }) + ' €';
return value;
},
+ render_date: function(value) {
+ var dateFormat = new Date(value);
+ var new_value = moment(dateFormat).format('Do MMM YYYY');
+ return new_value;
+ },
render_monetary_color: function(value) {
if (value >= 0)
value = '<span class="positive">'+value.toLocaleString('fr', { maximumFractionDigits: 0 }) + ' €</span>';
diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml
index 3db0769..28a2f78 100644
--- a/static/src/xml/lefilament_tdb.xml
+++ b/static/src/xml/lefilament_tdb.xml
@@ -125,6 +125,7 @@
<div class="col-xs-12">
<div class="card">
<p class="card-header">Trésorerie</p>
+ <p class="card-maj">Denière mise à jour le <t t-esc="widget.render_date(widget.values.date_maj)"></t></p>
<p class="card-number">
<strong><t t-esc="widget.render_monetary(widget.values.tresorerie)"></t></strong>
</p>
--
GitLab