From 657972b79be5f3cf9b5ece59b7bfc500a3e3188f Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Wed, 16 Jun 2021 16:49:24 +0200 Subject: [PATCH 1/2] FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty --- htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index c232edbe81c..69b6059e622 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -364,7 +364,11 @@ class pdf_espadon extends ModelePdfExpedition $tab_top_alt = $tab_top; $pdf->SetFont('', 'B', $default_font_size - 2); - $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); + if(!empty($object->tracking_number)) { + $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); + } else { + $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L'); + } $tab_top_alt = $pdf->GetY(); //$tab_top_alt += 1; From 50bc832532d58ccabbdf240906f87d4c274cd087 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Thu, 17 Jun 2021 10:48:48 +0200 Subject: [PATCH 2/2] FIX : better correction --- htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index 69b6059e622..48e70b29a45 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -362,15 +362,12 @@ class pdf_espadon extends ModelePdfExpedition { $tab_top = 88 + $height_incoterms; $tab_top_alt = $tab_top; - $pdf->SetFont('', 'B', $default_font_size - 2); if(!empty($object->tracking_number)) { $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); - } else { - $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L'); } - $tab_top_alt = $pdf->GetY(); + if(!empty($object->tracking_number)) $tab_top_alt = $pdf->GetY(); //$tab_top_alt += 1; // Tracking number