diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py index 5438175794090e924ed3426231e562aa2bb76d4e..942eee0ebd9af915c15c7c6ac01e2c64b52e14db 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 de30eefb141ef948aa82264340dcd729f37be35b..58d83c2546d869ba359cc6e47d7a26a6f6bc250a 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')); }