Clean unreachable code
This commit is contained in:
parent
cef43bf4b6
commit
c4dd689b08
@ -377,92 +377,16 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
|
|||||||
$default_font_size = pdf_getPDFFontSize($outputlangs);
|
$default_font_size = pdf_getPDFFontSize($outputlangs);
|
||||||
|
|
||||||
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
|
$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
|
||||||
return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
|
|
||||||
$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
|
|
||||||
$marge_basse=$this->marge_basse;
|
|
||||||
$marge_gauche=$this->marge_gauche;
|
|
||||||
$page_hauteur=$this->page_hauteur;
|
|
||||||
|
|
||||||
// Line of free text
|
// Line of free text
|
||||||
$line=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):"";
|
$newfreetext='';
|
||||||
|
$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
|
||||||
$pdf->SetFont('','', $default_font_size - 3);
|
if (! empty($conf->global->$paramfreetext))
|
||||||
$pdf->SetDrawColor(224,224,224);
|
|
||||||
|
|
||||||
// The start of the bottom of this page footer is positioned according to # of lines
|
|
||||||
$freetextheight=0;
|
|
||||||
if ($line) // Free text
|
|
||||||
{
|
|
||||||
//$line="eee<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
|
|
||||||
if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) // by default
|
|
||||||
{
|
|
||||||
$width=20000; $align='L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
|
|
||||||
if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
|
|
||||||
$width=200; $align='C';
|
|
||||||
}
|
|
||||||
$freetextheight=$pdf->getStringHeight($width,$line);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
|
|
||||||
//print '<br>'.$freetextheight;exit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$marginwithfooter=$marge_basse + $freetextheight;
|
|
||||||
$posy=$marginwithfooter+0;
|
|
||||||
|
|
||||||
if ($line) // Free text
|
|
||||||
{
|
|
||||||
$pdf->SetXY($dims['lm'],-$posy);
|
|
||||||
if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) // by default
|
|
||||||
{
|
|
||||||
$pdf->MultiCell(0, 3, $line, 0, $align, 0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
|
|
||||||
}
|
|
||||||
$posy-=$freetextheight;
|
|
||||||
}
|
|
||||||
|
|
||||||
// On positionne le debut du bas de page selon nbre de lignes de ce bas de page
|
|
||||||
/*
|
|
||||||
$nbofline=dol_nboflines_bis($line,0,$outputlangs->charset_output);
|
|
||||||
//print 'e'.$line.'t'.dol_nboflines($line);exit;
|
|
||||||
$posy=$marge_basse + ($nbofline*3);
|
|
||||||
|
|
||||||
if ($line) // Free text
|
|
||||||
{
|
{
|
||||||
$pdf->SetXY($marge_gauche,-$posy);
|
$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
|
||||||
$pdf->MultiCell(20000, 3, $line, 0, 'L', 0); // Use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
|
|
||||||
$posy-=($nbofline*3); // 6 of ligne + 3 of MultiCell
|
|
||||||
}*/
|
|
||||||
|
|
||||||
$pdf->SetY(-$posy);
|
|
||||||
$pdf->line($marge_gauche, $page_hauteur-$posy, 200, $page_hauteur-$posy);
|
|
||||||
$posy--;
|
|
||||||
|
|
||||||
/*if ($line1)
|
|
||||||
{
|
|
||||||
$pdf->SetXY($marge_gauche,-$posy);
|
|
||||||
$pdf->MultiCell(200, 2, $line1, 0, 'C', 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($line2)
|
return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
|
||||||
{
|
|
||||||
$posy-=3;
|
|
||||||
$pdf->SetXY($marge_gauche,-$posy);
|
|
||||||
$pdf->MultiCell(200, 2, $line2, 0, 'C', 0);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// Show page nb only on iso languages (so default Helvetica font)
|
|
||||||
if (pdf_getPDFFont($outputlangs) == 'Helvetica')
|
|
||||||
{
|
|
||||||
$pdf->SetXY(-20,-$posy);
|
|
||||||
$pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -590,8 +590,6 @@ class pdf_einstein extends ModelePDFCommandes
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -406,8 +406,6 @@ class pdf_strato extends ModelePDFContract
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","CONTRACT_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","CONTRACT_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -269,8 +269,6 @@ class html_cerfafr extends ModeleDon
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Error by default
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -482,8 +482,6 @@ class pdf_standard extends ModeleExpenseReport
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","EXPENSEREPORT_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -405,8 +405,6 @@ class pdf_soleil extends ModelePDFFicheinter
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","FICHEINTER_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","FICHEINTER_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -763,9 +763,6 @@ class pdf_azur extends ModelePDFPropales
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -549,8 +549,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -572,8 +572,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||||||
$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
|
$this->error=$langs->trans("ErrorConstantNotDefined","SUPPLIER_OUTPUTDIR");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
$this->error=$langs->trans("ErrorUnknown");
|
|
||||||
return 0; // Erreur par defaut
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -198,8 +198,6 @@ class InterfaceLogevents extends DolibarrTriggers
|
|||||||
dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
|
dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -260,7 +260,6 @@ abstract class ActionsCardCommon
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user