From dfef5326b109f5bb93ddcc7c8bcc610d0fd44f9f Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Mon, 15 Oct 2018 16:21:14 +0200
Subject: [PATCH] fix erreur treso et previ_treso si histo treso < 6 mois et
charges du previ = null
---
static/src/js/dashboard_year.js | 2 --
static/src/js/previ_tresorerie.js | 20 +++++++++++++++++---
static/src/js/tresorerie.js | 9 +++++++--
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js
index d5df1c4..2b5cc9f 100644
--- a/static/src/js/dashboard_year.js
+++ b/static/src/js/dashboard_year.js
@@ -99,8 +99,6 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) {
self.total2 = self.pfact2 + self.pcomm2 + self.ppipe2_win
self.target = self.values.target
-
- console.log(self.target);
deferred.resolve();
});
diff --git a/static/src/js/previ_tresorerie.js b/static/src/js/previ_tresorerie.js
index d6cdeff..a82e711 100644
--- a/static/src/js/previ_tresorerie.js
+++ b/static/src/js/previ_tresorerie.js
@@ -60,6 +60,13 @@ odoo.define('lefilament_tdb.previ_tresorerie', function (require) {
data_year.push(moment().month(month + i).format("YYYY-MM"));
}
var treso_r = this.reverse_array(this.values.tresorerie);
+ var treso_r_length = treso_r.length;
+
+ if (treso_r_length < 7 ) {
+ for (var i = 0; i < 6 - treso_r_length ; i++) {
+ treso_r.unshift( { 'treso': null, } );
+ }
+ }
var treso = [];
var cca = [];
@@ -85,6 +92,9 @@ odoo.define('lefilament_tdb.previ_tresorerie', function (require) {
// Trésorerie
if (treso_r[i]) { treso.push(treso_r[i].treso); }
+ console.log(treso_r);
+ console.log(this.values.charges_periode);
+
// Calcul des factures
_.each( this.values.factures, function(value, key) {
if (value.mois == data_year[i] ) {
@@ -108,10 +118,14 @@ odoo.define('lefilament_tdb.previ_tresorerie', function (require) {
else if ( i == 5 ) { charges_fixes.push(treso_r[5].treso); }
else {
// Trimestres
- if (['01', '04', '07', '10'].indexOf(data_months[i]) >= 0) {
- charges_fixes.push( this.values.charges_periode[0].sum + this.values.charges_periode[1].sum );
+ if (this.values.charges_periode.length > 0 ) {
+ if (['01', '04', '07', '10'].indexOf(data_months[i]) >= 0) {
+ charges_fixes.push( this.values.charges_periode[0].sum + this.values.charges_periode[1].sum );
+ } else {
+ charges_fixes.push( this.values.charges_periode[1].sum );
+ }
} else {
- charges_fixes.push( this.values.charges_periode[1].sum );
+ charges_fixes.push( null );
}
}
diff --git a/static/src/js/tresorerie.js b/static/src/js/tresorerie.js
index 491274f..7b563c5 100644
--- a/static/src/js/tresorerie.js
+++ b/static/src/js/tresorerie.js
@@ -57,9 +57,14 @@ odoo.define('lefilament_tdb.tresorerie', function (require) {
var cca = [];
var fonds_propres = []
var labels = [];
+ var minTab = 11;
var tabLength = this.values.tresorerie.length - 1;
+ if ( tabLength < 12 ) {
+ minTab = tabLength;
+ }
+
_.each(this.values.tresorerie, function(value, key) {
if (key == 0 ) {
treso.push(value.variation);
@@ -69,8 +74,8 @@ odoo.define('lefilament_tdb.tresorerie', function (require) {
}
});
-
- for (var i = (tabLength-11); i < tabLength+1 ; i++) {
+
+ for (var i = (tabLength-minTab); i < tabLength+1 ; i++) {
entree.push(this.values.tresorerie[i].entree);
sortie.push(this.values.tresorerie[i].sortie * (-1) );
variation.push(this.values.tresorerie[i].variation);
--
GitLab