diff --git a/ChangeLog b/ChangeLog index 611cbe55032..e47ec289da4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ Fix: [ bug #1397 ] Filter by supplier orders with status Draft does not filter. Fix: [ bug #1388 ] Wrong date when invoicing several orders. Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled. Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes. +Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande ***** ChangeLog for 3.5.2 compared to 3.5.1 ***** Fix: Can't add user for a task. diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 412f34b84be..d479d2c8059 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -180,7 +180,7 @@ class pdf_rouget extends ModelePdfExpedition $tab_height = 130; $tab_height_newpage = 150; - if (! empty($object->note_public) || ! empty($object->tracking_number)) + if (! empty($object->note_public) || (! empty($object->tracking_number) && ! empty($object->shipping_method_id))) { $tab_top = 88; $tab_top_alt = $tab_top;