From e4b697fa75d3e6067e9cdaf29b5c15951c019967 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Mar 2012 22:18:15 +0100
Subject: [PATCH] New: Show delivery date into proposal template azur.
---
ChangeLog | 1 +
.../modules/propale/doc/pdf_azur.modules.php | 20 ++++++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e4191329cc..92e60740ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@ For users:
- New: [ task #176 ] Allow to use ODT templates for proposals and orders like it's done for invoices
- New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as background of invoice/order generated PDF.
- New: Can convert a product/service into service/product.
+- New: Show delivery date into proposal template azur.
- Fix: Can use POS module with several concurrent users.
- Fix: Installer don't fails with Mysql version that added a ssl_cypher field.
- Fix: Sanitize input parameters.
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c4d4b5cbef9..4ff5d2922f6 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -463,8 +463,22 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+4;
}
- // Show availability conditions
- if ($object->type != 2 && ($object->availability_code || $object->availability))
+ // Show shipping date
+ if ($object->type != 2 && $object->date_livraison)
+ {
+ $outputlangs->load("sendings");
+ $pdf->SetFont('','B', $default_font_size - 2);
+ $pdf->SetXY($this->marge_gauche, $posy);
+ $titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+ $pdf->MultiCell(80, 4, $titre, 0, 'L');
+ $pdf->SetFont('','', $default_font_size - 2);
+ $pdf->SetXY(82, $posy);
+ $dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
+ $pdf->MultiCell(80, 4, $dlp, 0, 'L');
+
+ $posy=$pdf->GetY()+1;
+ }
+ elseif ($object->type != 2 && ($object->availability_code || $object->availability)) // Show availability conditions
{
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
@@ -475,7 +489,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetXY(82, $posy);
$lib_availability=$outputlangs->transnoentities("AvailabilityType".$object->availability_code)!=('AvailabilityType'.$object->availability_code)?$outputlangs->transnoentities("AvailabilityType".$object->availability_code):$outputlangs->convToOutputCharset($object->availability);
$lib_availability=str_replace('\n',"\n",$lib_availability);
- $pdf->MultiCell(80, 4, $lib_availability,0,'L');
+ $pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
$posy=$pdf->GetY()+1;
}
--
GitLab