Debug v18

This commit is contained in:
Laurent Destailleur 2023-06-27 01:14:54 +02:00
parent e2fd64d47c
commit b49a256240
2 changed files with 6 additions and 4 deletions

View file

@ -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";

View file

@ -90,6 +90,8 @@ class ExpenseReport extends CommonObject
public $fk_statut;
public $fk_c_paiement;
public $modepaymentid;
public $paid;
public $user_author_infos;