';
//print 'nbpage='.$totalPages.' viewline='.$viewline.' limitsql='.$limitsql;
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index a168e483d7c..31b1d0812f8 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -114,7 +114,7 @@ class FactureStats extends Stats
*/
function getNbByYear()
{
- global $user;
+ global $user;
$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
$sql.= " FROM ".$this->from;
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 6e670bd01c5..8a27b4b524e 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -58,8 +58,8 @@ class DoliDBPgsql
var $lastquery;
// Saved last error
var $lastqueryerror;
- var $lasterror;
- var $lasterrno;
+ var $lasterror;
+ var $lasterrno;
var $unescapeslashquot=0; // By default we do not force the unescape of \'. This is used only to process sql with mysql escaped data.
var $standard_conforming_strings=1; // Database has option standard_conforming_strings to on
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 38753901d2e..f5815e7b493 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1147,7 +1147,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetXY($posx+2,$posy);
@@ -1204,6 +1204,8 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
+
+ $pdf->SetTextColor(0,0,0);
}
/**
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index d99e3b3d407..5163d86c40d 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -581,7 +581,7 @@ class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',$default_font_size);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetFont('','', $default_font_size - 1);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index d726b3fc770..78b2a2eccfa 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1424,6 +1424,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
+
+ $pdf->SetTextColor(0,0,0);
}
/**
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 13e6ba6f3a5..cc1b5994026 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -531,7 +531,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetTextColor(0,0,60);
$pdf->SetFont('','B',$default_font_size);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetFont('','', $default_font_size - 1);
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index 13d37d3bb21..44ffd2cb208 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -723,7 +723,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B',$default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetXY($posx+2,$posy);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 84ac223466b..83d0265cd7f 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1212,7 +1212,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetXY($posx+2,$posy);
@@ -1268,6 +1268,8 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
+
+ $pdf->SetTextColor(0,0,0);
}
/**
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index afd2e62b518..75af2b06b99 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -931,7 +931,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetXY($posx+2,$posy);
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 566d1e195bc..d7c30f6d610 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -1000,7 +1000,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
- $posy=$pdf->getY();
+ $posy=$pdf->getY();
// Show sender information
$pdf->SetXY($posx+2,$posy);
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 3ca6ccb2221..bb8844eafc6 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -63,7 +63,7 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="fullname";
-if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
+if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield="level1name";
$ecmdir = new EcmDirectory($db);
if ($section)
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index d68b2acd74a..ce998889778 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -125,9 +125,9 @@ if ($resql)
$param="";
if ($search_ref) $param.="&search_ref=".$search_ref;
- if ($search_nom) $param.="&search_nom=".$search_nom;
- if ($search_user) $param.="&search_user=".$search_user;
- if ($search_ttc) $param.="&search_ttc=".$search_ttc;
+ if ($search_nom) $param.="&search_nom=".$search_nom;
+ if ($search_user) $param.="&search_user=".$search_user;
+ if ($search_ttc) $param.="&search_ttc=".$search_ttc;
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
print '