Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE

- Fix hide payment condition for supplier proposal
This commit is contained in:
KHELIFA 2017-12-21 16:58:37 +01:00
parent aad0da2513
commit d069ccdb7f
2 changed files with 2 additions and 16 deletions

View File

@ -869,7 +869,7 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+3;
}
if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND))
if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
{
// Check a payment mode is defined
/* Not required on a proposal

View File

@ -716,22 +716,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
$posy=$pdf->GetY()+3;
}
else {
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posxval, $posy);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
$pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
$posy=$pdf->GetY()+3;
}
if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMCOND))
if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE))
{
// Show payment mode
if ($object->mode_reglement_code