diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fa65b87d64b..6e5907ff13f 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -48,7 +48,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'banque',$id,'bank_account','','',$fieldid); $req_nb=GETPOST("req_nb",'',3); -$thirdarty=GETPOST("thirdparty",'',3); +$thirdparty=GETPOST("thirdparty",'',3); $account=GETPOST("account"); $vline=GETPOST("vline"); $action=GETPOST("action"); @@ -211,7 +211,7 @@ if ($account || $_GET["ref"]) } if ($thirdparty) { - $sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%')"; + $sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%'"; $param.='&thirdparty='.urlencode($thirdparty); $mode_search = 1; } diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 928b1bf5a1a..073f6f50a08 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -739,11 +739,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl { if ($idprod) { - if ( empty($hidedesc) ) $libelleproduitservice.=$desc; + if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1); } else { - $libelleproduitservice.=$desc; + $libelleproduitservice.=dol_htmlentitiesbr($desc,1); } } } diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index d3eef74bbe6..61b02a8fc0f 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -651,7 +651,8 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0) $sql.= " AND ec.fk_socpeople = ".$user->id; } $sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut"; - + $sql.= " ORDER BY p.title, p.ref"; + $var=true; $resql = $db->query($sql); if ( $resql )