From d069ccdb7fe1787f5293981207ab97045f420042 Mon Sep 17 00:00:00 2001 From: KHELIFA Date: Thu, 21 Dec 2017 16:58:37 +0100 Subject: [PATCH] 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 --- .../modules/propale/doc/pdf_azur.modules.php | 2 +- .../supplier_proposal/doc/pdf_aurore.modules.php | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 76ab2ae7655..dc687b0d2c9 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -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 diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index d48543442f4..ecdd99d140f 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -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