diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php index d8efa1b9dbc..94106c47134 100644 --- a/htdocs/core/boxes/box_scheduled_jobs.php +++ b/htdocs/core/boxes/box_scheduled_jobs.php @@ -164,8 +164,8 @@ class box_scheduled_jobs extends ModeleBoxes 'text' => $langs->trans("NumberScheduledJobError") ); $this->info_box_contents[$line][] = array( - 'td' => 'class="right"colspan="2"', - 'textnoformat' => $nbjobsinerror ? ''.$nbjobsinerror.''.img_error() : '0' + 'td' => 'class="right" colspan="2"', + 'textnoformat' => ($nbjobsinerror ? ''.$nbjobsinerror.''.img_error() : '0') ); } else { $this->info_box_contents[0][0] = array( diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index bd350e40991..36638be33c1 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -1151,10 +1151,11 @@ class DolGraph $this->stringtoshow .= ', stacked: true'; } $this->stringtoshow .= ' }]'; + $this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }'; if ($type == 'bar' && count($arrayofgroupslegend) > 0) { - $this->stringtoshow .= ', yAxes: [{ stacked: true }]'; + $this->stringtoshow .= ', stacked: true'; } - $this->stringtoshow .= ' }'; + $this->stringtoshow .= ' }] }'; // Add a callback to change label to show only positive value if ($isfunnel) { $this->stringtoshow .= ', tooltips: { mode: \'nearest\',