From fc5a07a7c63d97f7d78ccaee3826f040dd09b4cb Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Tue, 30 May 2017 09:26:50 +0200
Subject: [PATCH] =?UTF-8?q?[add]=20reste=20=C3=A0=20encaisser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
models/lefilament_tdb.py | 4 +++-
static/src/js/dashboard_year.js | 1 +
static/src/xml/lefilament_tdb.xml | 8 ++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index 879e738..20e54bb 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 eccace8..6b310c2 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 5bb3b43..cd17d16 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">
--
GitLab