From f2ec94e9fdc87d8e069921e90507dcf4281ed720 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 4 Sep 2018 11:13:54 +0200 Subject: [PATCH] FIX #9353 Bug: html error - div inside span on graphs --- htdocs/core/class/dolgraph.class.php | 4 ++-- htdocs/install/mysql/tables/llx_commande.key.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index f40d30f389e..b002c96f081 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -924,7 +924,7 @@ class DolGraph var percent=Math.round(series.percent); var number=series.data[0][1]; return \''; - $this->stringtoshow.='
'; + $this->stringtoshow.=''; if ($urltemp) $this->stringtoshow.=''; $this->stringtoshow.='\'+'; $this->stringtoshow.=($showlegend?'':'label+\' \'+'); // Hide label if already shown in legend @@ -932,7 +932,7 @@ class DolGraph $this->stringtoshow.=($showpercent?'\'
\'+percent+\'%\'+':''); $this->stringtoshow.='\''; if ($urltemp) $this->stringtoshow.='
'; - $this->stringtoshow.='
\'; + $this->stringtoshow.='\'; }, background: { opacity: 0.0, diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index 9652079846e..9134092195b 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -18,7 +18,7 @@ -- ============================================================================ --- Supprimme orphelins pour permettre montee de la cle +-- Delete orphans -- V4 DELETE llx_commande FROM llx_commande LEFT JOIN llx_societe ON llx_commande.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande ADD UNIQUE INDEX uk_commande_ref (ref, entity);