diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 5a5389c0a85..f191ba0ce98 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -46,15 +46,10 @@ $formproduct=new FormProduct($db);
Point of Sale login
-
-
-
-
-
-
+
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 11102b7ec6b..a24f6c6a65e 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -70,7 +70,6 @@ $contenttype=dol_mimetype($format);
if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
//$contenttype='text/plain';
$outputencoding='UTF-8';
-//$contenttype='ISO-8859-1';
if ($contenttype) header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index d8f196bca1e..1a533978ab1 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -113,8 +113,8 @@ class pdf_crabe extends ModelePDFFactures
global $user,$langs,$conf;
if (! is_object($outputlangs)) $outputlangs=$langs;
- // Force output charset to ISO, because, FPDF expect text encoded in ISO
- $outputlangs->charset_output='ISO-8859-1';
+ // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+ if (!class_exists('TCPDF', false)) $outputlangs->charset_output='ISO-8859-1';
$outputlangs->load("main");
$outputlangs->load("dict");
@@ -253,10 +253,10 @@ class pdf_crabe extends ModelePDFFactures
//$libelleproduitservice=pdf_getlinedesc($object,$i,$outputlangs);
$pdf->SetFont('','', 9); // Dans boucle pour gerer multi-page
-
+
$curX = $this->posxdesc-1;
pdf_getlinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY);
-
+
//$pdf->writeHTMLCell($this->posxtva-$this->posxdesc-1, 3, $this->posxdesc-1, $curY, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 1);
$pdf->SetFont('','', 9); // On repositionne la police par defaut
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index ae30d75e387..8d46cda6ac4 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -3339,10 +3339,10 @@ function utf8_check($str)
/**
- * \brief Return an UTF8 string encoded into OS filesystem encoding. This function is used to define
+ * Return an UTF-8 string encoded into OS filesystem encoding. This function is used to define
* value to pass to filesystem PHP functions.
- * \param $str String to encode (UTF8)
- * \return string Encoded string (UTF8, ISO-8859-1)
+ * @param $str String to encode (UTF-8)
+ * @return string Encoded string (UTF-8, ISO-8859-1)
*/
function dol_osencode($str)
{
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 6020c384ca6..076b01afba6 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -128,7 +128,6 @@ if ($format == 'ical' || $format == 'vcal')
if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
//$contenttype='text/plain';
$outputencoding='UTF-8';
- //$contenttype='ISO-8859-1';
if ($contenttype) header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
if ($attachment) header('Content-Disposition: attachment; filename="'.$shortfilename.'"');
@@ -165,7 +164,6 @@ if ($format == 'rss')
if (isset($_GET["contenttype"])) $contenttype=$_GET["contenttype"];
//$contenttype='text/plain';
$outputencoding='UTF-8';
- //$contenttype='ISO-8859-1';
if ($contenttype) header('Content-Type: '.$contenttype.($outputencoding?'; charset='.$outputencoding:''));
if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
diff --git a/htdocs/webservices/server.wsdl b/htdocs/webservices/server.wsdl
index e47ec726b28..f924fa87bd4 100644
--- a/htdocs/webservices/server.wsdl
+++ b/htdocs/webservices/server.wsdl
@@ -1,4 +1,4 @@
-
+