From d32f52cc506341766c81b5dc191253f749312091 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Jan 2015 16:23:23 +0100
Subject: [PATCH] Fix date of delivery, and avoid duplicate tracking number.
---
.../modules/expedition/doc/pdf_merou.modules.php | 16 ++++++++++++----
.../expedition/doc/pdf_rouget.modules.php | 15 +++++++++++----
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index fefe2f591fe..e861bff6169 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -560,7 +560,7 @@ class pdf_merou extends ModelePdfExpedition
$pdf->SetXY($blSocX-80,$blSocY+17);
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetTextColor(0,0,0);
- $pdf->MultiCell(50, 8, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '', 'L');
+ $pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDelivery")." : " . dol_print_date($object->date_delivery,'day',false,$outputlangs,true), '', 'L');
$pdf->SetXY($blSocX-80,$blSocY+20);
$pdf->SetFont('','B', $default_font_size - 2);
@@ -568,7 +568,7 @@ class pdf_merou extends ModelePdfExpedition
$pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : " . $object->tracking_number, '', 'L');
// Deliverer
- $pdf->SetXY($blSocX-80,$blSocY+24);
+ $pdf->SetXY($blSocX-80,$blSocY+23);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->SetTextColor(0,0,0);
@@ -581,8 +581,16 @@ class pdf_merou extends ModelePdfExpedition
{
// Get code using getLabelFromKey
$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
- $label=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
- $pdf->writeHTMLCell(50, 8, '', '', $label." ".$object->tracking_url, '', 'L');
+ $label='';
+ $label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
+ //var_dump($object->tracking_url != $object->tracking_number);exit;
+ if ($object->tracking_url != $object->tracking_number)
+ {
+ $label.=" : ";
+ $label.=$object->tracking_url;
+ }
+ $pdf->SetFont('','B', $default_font_size - 2);
+ $pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
}
}
}
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index ef9db41254b..9c5dada3a72 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -212,10 +212,17 @@ class pdf_rouget extends ModelePdfExpedition
{
// Get code using getLabelFromKey
$code=$outputlangs->getLabelFromKey($this->db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
- $label=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
- $label.=$outputlangs->trans("SendingMethod".strtoupper($code))." :";
+ $label='';
+ if ($object->tracking_url != $object->tracking_number) $label.=$outputlangs->trans("LinkToTrackYourPackage")."<br>";
+ $label.=$outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
+ //var_dump($object->tracking_url != $object->tracking_number);exit;
+ if ($object->tracking_url != $object->tracking_number)
+ {
+ $label.=" : ";
+ $label.=$object->tracking_url;
+ }
$pdf->SetFont('','B', $default_font_size - 2);
- $pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top+6, $label." ".$object->tracking_url, 0, 1, false, true, 'L');
+ $pdf->writeHTMLCell(60, 4, $this->posxdesc-1, $tab_top_alt, $label, 0, 1, false, true, 'L');
$tab_top_alt = $pdf->GetY();
}
@@ -537,7 +544,7 @@ class pdf_rouget extends ModelePdfExpedition
$posy+=4;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
- $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_creation,"daytext",false,$outputlangs,true), '', 'R');
+ $pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true), '', 'R');
if (! empty($object->client->code_client))
{
--
GitLab