From 8bfb5839cace2eabbfa37a59778454d24490170b Mon Sep 17 00:00:00 2001 From: phf Date: Tue, 3 Feb 2015 16:53:09 +0100 Subject: [PATCH] [CORE] modification de l'affichage (#new_ask_price). --- .../doc/pdf_aurore.modules.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php index 718d4e8af63..fafaed64885 100644 --- a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php @@ -703,6 +703,20 @@ class pdf_aurore extends ModelePDFAskPriceSupplier $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->PROPALE_PDF_HIDE_PAYMENTTERMCOND)) { @@ -728,11 +742,11 @@ class pdf_aurore extends ModelePDFAskPriceSupplier && $object->mode_reglement_code != 'VIR') { $pdf->SetFont('','B', $default_font_size - 2); - $pdf->SetXY($this->marge_gauche, $posy); + $pdf->SetXY($this->marge_gauche, $posy-2); $titre = $outputlangs->transnoentities("PaymentMode").':'; $pdf->MultiCell(80, 5, $titre, 0, 'L'); $pdf->SetFont('','', $default_font_size - 2); - $pdf->SetXY($posxval, $posy); + $pdf->SetXY($posxval, $posy-2); $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement); $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');