Merge pull request #1582 from marcosgdf/changelog

Changelog

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.

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";

htdocs/livraison/fiche.php

@@ -514,16 +514,16 @@ else
 			// Shipment
 			if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0)
 			{
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
-				
-				// Ref
-				print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
-				print '<td colspan="3">';
+				$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
+				
+				// Ref
+				print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
+				print '<td colspan="3">';
 				// Nav is hidden because on a delivery receipt of a shipment, if we go on next shipment, we may find no tab (a shipment may not have delivery receipt yet)
-				//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
+				//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
 				print $form->showrefnav($expedition, 'refshipment', $linkback, 0, 'ref', 'ref');
-				print '</td></tr>';
-			}			
+				print '</td></tr>';
+			}			
 				
 			// Ref
 			print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';