lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CR

Browse Source
This commit is contained in:
Marcos García 2013-06-10 00:09:16 +02:00
parent 0abcea745e
commit 9c0fe61a21
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/class/html.form.class.php
View File

@ -1654,21 +1654,21 @@ class Form
// Add criteria on ref/label // Add criteria on ref/label
if ($filterkey != '') if ($filterkey != '')
{ {
$sql.=' AND ('; $sql.=' AND (';
$prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on $prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
// For natural search // For natural search
$scrit = explode(' ', $filterkey); $scrit = explode(' ', $filterkey);
$i=0; $i=0;
if (count($scrit) > 1) $sql.="("; if (count($scrit) > 1) $sql.="(";
foreach ($scrit as $crit) foreach ($scrit as $crit)
{ {
if ($i > 0) $sql.=" AND "; if ($i > 0) $sql.=" AND ";
$sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')"; $sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')";
$i++; $i++;
} }
if (count($scrit) > 1) $sql.=")"; if (count($scrit) > 1) $sql.=")";
if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'"; if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
$sql.=')'; $sql.=')';
} }
$sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC"; $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

54
htdocs/core/lib/pdf.lib.php
View File

@ -80,35 +80,35 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
// Define constant for TCPDF // Define constant for TCPDF
define('K_TCPDF_EXTERNAL_CONFIG',1); // this avoid using tcpdf_config file 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/'); define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
dol_mkdir(K_PATH_CACHE); dol_mkdir(K_PATH_CACHE);
define('K_BLANK_IMAGE', '_blank.png'); define('K_BLANK_IMAGE', '_blank.png');
define('PDF_PAGE_FORMAT', 'A4'); define('PDF_PAGE_FORMAT', 'A4');
define('PDF_PAGE_ORIENTATION', 'P'); define('PDF_PAGE_ORIENTATION', 'P');
define('PDF_CREATOR', 'TCPDF'); define('PDF_CREATOR', 'TCPDF');
define('PDF_AUTHOR', 'TCPDF'); define('PDF_AUTHOR', 'TCPDF');
define('PDF_HEADER_TITLE', 'TCPDF Example'); define('PDF_HEADER_TITLE', 'TCPDF Example');
define('PDF_HEADER_STRING', "by Dolibarr ERP CRM"); define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
define('PDF_UNIT', 'mm'); define('PDF_UNIT', 'mm');
define('PDF_MARGIN_HEADER', 5); define('PDF_MARGIN_HEADER', 5);
define('PDF_MARGIN_FOOTER', 10); define('PDF_MARGIN_FOOTER', 10);
define('PDF_MARGIN_TOP', 27); define('PDF_MARGIN_TOP', 27);
define('PDF_MARGIN_BOTTOM', 25); define('PDF_MARGIN_BOTTOM', 25);
define('PDF_MARGIN_LEFT', 15); define('PDF_MARGIN_LEFT', 15);
define('PDF_MARGIN_RIGHT', 15); define('PDF_MARGIN_RIGHT', 15);
define('PDF_FONT_NAME_MAIN', 'helvetica'); define('PDF_FONT_NAME_MAIN', 'helvetica');
define('PDF_FONT_SIZE_MAIN', 10); define('PDF_FONT_SIZE_MAIN', 10);
define('PDF_FONT_NAME_DATA', 'helvetica'); define('PDF_FONT_NAME_DATA', 'helvetica');
define('PDF_FONT_SIZE_DATA', 8); define('PDF_FONT_SIZE_DATA', 8);
define('PDF_FONT_MONOSPACED', 'courier'); define('PDF_FONT_MONOSPACED', 'courier');
define('PDF_IMAGE_SCALE_RATIO', 1.25); define('PDF_IMAGE_SCALE_RATIO', 1.25);
define('HEAD_MAGNIFICATION', 1.1); define('HEAD_MAGNIFICATION', 1.1);
define('K_CELL_HEIGHT_RATIO', 1.25); define('K_CELL_HEIGHT_RATIO', 1.25);
define('K_TITLE_MAGNIFICATION', 1.3); define('K_TITLE_MAGNIFICATION', 1.3);
define('K_SMALL_RATIO', 2/3); define('K_SMALL_RATIO', 2/3);
define('K_THAI_TOPCHARS', true); define('K_THAI_TOPCHARS', true);
define('K_TCPDF_CALLS_IN_HTML', true); define('K_TCPDF_CALLS_IN_HTML', true);
define('K_TCPDF_THROW_EXCEPTION_ERROR', false); define('K_TCPDF_THROW_EXCEPTION_ERROR', false);

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -466,7 +466,7 @@ class pdf_crabe extends ModelePDFFactures
// Pied de page // Pied de page
$this->_pagefoot($pdf,$object,$outputlangs); $this->_pagefoot($pdf,$object,$outputlangs);
if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages(); if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
$pdf->Close(); $pdf->Close();