diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d02d0d56789..dae7dad00d4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1654,21 +1654,21 @@ class Form
// Add criteria on ref/label
if ($filterkey != '')
{
- $sql.=' AND (';
- $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
- // For natural search
- $scrit = explode(' ', $filterkey);
- $i=0;
- if (count($scrit) > 1) $sql.="(";
- foreach ($scrit as $crit)
- {
- if ($i > 0) $sql.=" AND ";
- $sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')";
- $i++;
- }
- if (count($scrit) > 1) $sql.=")";
- if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
- $sql.=')';
+ $sql.=' AND (';
+ $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+ // For natural search
+ $scrit = explode(' ', $filterkey);
+ $i=0;
+ if (count($scrit) > 1) $sql.="(";
+ foreach ($scrit as $crit)
+ {
+ if ($i > 0) $sql.=" AND ";
+ $sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')";
+ $i++;
+ }
+ if (count($scrit) > 1) $sql.=")";
+ if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
+ $sql.=')';
}
$sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 5e204ccd840..7f1420cb7ae 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -80,35 +80,35 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
// Define constant for TCPDF
define('K_TCPDF_EXTERNAL_CONFIG',1); // this avoid using tcpdf_config file
- define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+ define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
dol_mkdir(K_PATH_CACHE);
- define('K_BLANK_IMAGE', '_blank.png');
- define('PDF_PAGE_FORMAT', 'A4');
- define('PDF_PAGE_ORIENTATION', 'P');
- define('PDF_CREATOR', 'TCPDF');
- define('PDF_AUTHOR', 'TCPDF');
- define('PDF_HEADER_TITLE', 'TCPDF Example');
- define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
- define('PDF_UNIT', 'mm');
- define('PDF_MARGIN_HEADER', 5);
- define('PDF_MARGIN_FOOTER', 10);
- define('PDF_MARGIN_TOP', 27);
- define('PDF_MARGIN_BOTTOM', 25);
- define('PDF_MARGIN_LEFT', 15);
- define('PDF_MARGIN_RIGHT', 15);
- define('PDF_FONT_NAME_MAIN', 'helvetica');
- define('PDF_FONT_SIZE_MAIN', 10);
- define('PDF_FONT_NAME_DATA', 'helvetica');
- define('PDF_FONT_SIZE_DATA', 8);
- define('PDF_FONT_MONOSPACED', 'courier');
- define('PDF_IMAGE_SCALE_RATIO', 1.25);
- define('HEAD_MAGNIFICATION', 1.1);
- define('K_CELL_HEIGHT_RATIO', 1.25);
- define('K_TITLE_MAGNIFICATION', 1.3);
- define('K_SMALL_RATIO', 2/3);
- define('K_THAI_TOPCHARS', true);
- define('K_TCPDF_CALLS_IN_HTML', true);
+ define('K_BLANK_IMAGE', '_blank.png');
+ define('PDF_PAGE_FORMAT', 'A4');
+ define('PDF_PAGE_ORIENTATION', 'P');
+ define('PDF_CREATOR', 'TCPDF');
+ define('PDF_AUTHOR', 'TCPDF');
+ define('PDF_HEADER_TITLE', 'TCPDF Example');
+ define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
+ define('PDF_UNIT', 'mm');
+ define('PDF_MARGIN_HEADER', 5);
+ define('PDF_MARGIN_FOOTER', 10);
+ define('PDF_MARGIN_TOP', 27);
+ define('PDF_MARGIN_BOTTOM', 25);
+ define('PDF_MARGIN_LEFT', 15);
+ define('PDF_MARGIN_RIGHT', 15);
+ define('PDF_FONT_NAME_MAIN', 'helvetica');
+ define('PDF_FONT_SIZE_MAIN', 10);
+ define('PDF_FONT_NAME_DATA', 'helvetica');
+ define('PDF_FONT_SIZE_DATA', 8);
+ define('PDF_FONT_MONOSPACED', 'courier');
+ define('PDF_IMAGE_SCALE_RATIO', 1.25);
+ define('HEAD_MAGNIFICATION', 1.1);
+ define('K_CELL_HEIGHT_RATIO', 1.25);
+ define('K_TITLE_MAGNIFICATION', 1.3);
+ define('K_SMALL_RATIO', 2/3);
+ define('K_THAI_TOPCHARS', true);
+ define('K_TCPDF_CALLS_IN_HTML', true);
define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 7bb397b5019..f574d5b0479 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -466,7 +466,7 @@ class pdf_crabe extends ModelePDFFactures
// Pied de page
$this->_pagefoot($pdf,$object,$outputlangs);
- if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+ if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close();