diff --git a/ChangeLog b/ChangeLog index 07cd416c214..189dd345490 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ Fix: Pb of records not correctly cleaned when module marge is Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing. Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents. Fix: Suppliers invoice mask fails using {tttt} in numbering. -Fix: pdf template name for typhon was not correctly et when enabling module. +Fix: [ bug #1350 ] pdf template name for typhon was not correctly set when enabling module. Fix: Navigation on notes for shipments was not working. Fix: [ bug #1353 ] Email notifications, wrong URL. Fix: [ bug #1362 ] Note is not saved. diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php index f21b2d82ec8..bdc74a66cf3 100644 --- a/htdocs/core/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -102,7 +102,7 @@ class modExpedition extends DolibarrModules $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment"; $this->const[$r][3] = ""; $this->const[$r][4] = 0; - $r++; + $r++; $this->const[$r][0] = "LIVRAISON_ADDON_PDF"; $this->const[$r][1] = "chaine"; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 32c5c474ba1..49049a20783 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -514,16 +514,16 @@ else // Shipment if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0) { - $linkback = ''.$langs->trans("BackToList").''; - - // Ref - print '