diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 362d61e5325..5ae49ee1403 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -64,6 +64,7 @@ class DolGraph public $horizTickIncrement = -1; public $SetNumXTicks = -1; public $labelInterval = -1; + public $YLabel; public $hideXGrid = false; public $hideXValues = false; @@ -765,7 +766,7 @@ class DolGraph private function draw_jflot($file, $fileurl) { // phpcs:enable - global $conf, $langs; + global $langs; dol_syslog(get_class($this) . "::draw_jflot this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue); @@ -913,7 +914,7 @@ class DolGraph interactive: true },'; if (count($datacolor)) { - $this->stringtoshow .= 'colors: ' . (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)) . ','; + $this->stringtoshow .= 'colors: ' . json_encode($datacolor) . ','; } $this->stringtoshow .= 'legend: {show: ' . ($showlegend ? 'true' : 'false') . ', position: \'ne\' } }); @@ -1052,7 +1053,7 @@ class DolGraph private function draw_chart($file, $fileurl) { // phpcs:enable - global $conf, $langs; + global $langs; dol_syslog(get_class($this) . "::draw_chart this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue); @@ -1276,7 +1277,6 @@ class DolGraph $i = 0; while ($i < $nblot) { // Loop on each serie $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; - //$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)); if ($i > 0) { $this->stringtoshow .= ', ' . "\n"; diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 020117009a3..3d944b7734a 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -90,6 +90,8 @@ class ExpenseReport extends CommonObject public $fk_statut; public $fk_c_paiement; + public $modepaymentid; + public $paid; public $user_author_infos;