From 9bbc42cf9a2cb82e0361b42b1bf8c2cda3d9e5c5 Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Fri, 22 Sep 2017 19:50:30 +0200
Subject: [PATCH] add cca
---
models/lefilament_tdb.py | 2 +-
static/src/js/tresorerie.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index 942eee0..d1a84af 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -194,7 +194,7 @@ class LeFilamentTdb(models.Model):
sum(es.total_amount) as cca
from hr_expense_sheet es, hr_expense e
where es.id = e.sheet_id and e.payment_mode='own_account' and es.state!='done';""")
- cca = self._cr.dictfetchall()
+ cca = self._cr.fetchone()[0]
return { 'tresorerie': tresorerie, 'cca': cca }
diff --git a/static/src/js/tresorerie.js b/static/src/js/tresorerie.js
index de6e3e1..5f754ef 100644
--- a/static/src/js/tresorerie.js
+++ b/static/src/js/tresorerie.js
@@ -73,7 +73,8 @@ odoo.define('lefilament_tdb.tresorerie', function (require) {
labels.push(moment(this.values.tresorerie[i].mois).format('MMM YYYY'));
}
-
+ console.log(this.values);
+
var datasets = [
{ label: 'Trésorerie', data: treso.slice(tabLength-11, tabLength+1), backgroundColor: 'transparent',borderColor: '#5E8ED5' },
{ label: 'CCA', data: cca, backgroundColor: 'transparent',borderColor: '#FFA063' },
--
GitLab