From e5a40ec97e4846fb1935e660ef4aad9892ac68c8 Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Fri, 22 Sep 2017 19:44:12 +0200
Subject: [PATCH] add cca
---
models/lefilament_tdb.py | 6 ++----
static/src/js/tresorerie.js | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index 5438175..942eee0 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -190,12 +190,10 @@ class LeFilamentTdb(models.Model):
order by date_trunc('month', date);""")
tresorerie = self._cr.dictfetchall()
- self._cr.execute("""SELECT to_char(date_trunc('month', e.date),'YYYY-MM') as mois,
+ self._cr.execute("""SELECT
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'
- group by date_trunc('month', e.date)
- order by date_trunc('month', e.date);""")
+ where es.id = e.sheet_id and e.payment_mode='own_account' and es.state!='done';""")
cca = self._cr.dictfetchall()
return { 'tresorerie': tresorerie, 'cca': cca }
diff --git a/static/src/js/tresorerie.js b/static/src/js/tresorerie.js
index de30eef..58d83c2 100644
--- a/static/src/js/tresorerie.js
+++ b/static/src/js/tresorerie.js
@@ -69,7 +69,7 @@ odoo.define('lefilament_tdb.tresorerie', function (require) {
entree.push(this.values.tresorerie[i].entree);
sortie.push(this.values.tresorerie[i].sortie * (-1) );
variation.push(this.values.tresorerie[i].variation);
- cca.push(this.values.cca[i].cca);
+ cca.push(this.values.cca.cca);
labels.push(moment(this.values.tresorerie[i].mois).format('MMM YYYY'));
}
--
GitLab