diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index f5f069376bf..535bebefa75 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -817,7 +817,7 @@ else
 			// Weight
 			print '<tr><td>'.$html->editfieldkey("TotalWeight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
 			print $html->editfieldval("TotalWeight",'trueWeight',$expedition->trueWeight,'id',$expedition->id,$user->rights->expedition->creer);
-			print measuring_units_string($expedition->weight_units,"weight");
+			print $expedition->weight_units?measuring_units_string($expedition->weight_units,"weight"):'';
 			print '</td></tr>';
 
 			// Volume Total
@@ -841,19 +841,19 @@ else
 			// Width
 			print '<tr><td>'.$html->editfieldkey("Width",'trueWidth',$expedition->trueWidth,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
 			print $html->editfieldval("Width",'trueWidth',$expedition->trueWidth,'id',$expedition->id,$user->rights->expedition->creer);
-			print measuring_units_string($expedition->width_units,"size");
+			print $expedition->trueWidth?measuring_units_string($expedition->width_units,"size"):'';
 			print '</td></tr>';
 
 			// Height
 			print '<tr><td>'.$html->editfieldkey("Height",'trueHeight',$expedition->trueHeight,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
 			print $html->editfieldval("Height",'trueHeight',$expedition->trueHeight,'id',$expedition->id,$user->rights->expedition->creer);
-			print measuring_units_string($expedition->height_units,"size");
+			print $expedition->trueHeight?measuring_units_string($expedition->height_units,"size"):'';
 			print '</td></tr>';
 
 			// Depth
 			print '<tr><td>'.$html->editfieldkey("Depth",'trueDepth',$expedition->trueDepth,'id',$expedition->id,$user->rights->expedition->creer).'</td><td colspan="3">';
 			print $html->editfieldval("Depth",'trueDepth',$expedition->trueDepth,'id',$expedition->id,$user->rights->expedition->creer);
-			print measuring_units_string($expedition->depth_units,"size");
+			print $expedition->trueDepth?measuring_units_string($expedition->depth_units,"size"):'';
 			print '</td></tr>';
 
 			// Status
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index c6deb3d41df..cb7799a078c 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -115,8 +115,8 @@ if ($resql)
 		print "<a href=\"fiche.php?id=".$objp->rowid."\">".$objp->ref."</a></td>\n";
 		// Third party
 		print '<td>';
-		$companystatic->id=$objp->id;
-		$companystatic->ref=$objp->id;
+		$companystatic->id=$objp->socid;
+		$companystatic->ref=$objp->socname;
 		$companystatic->nom=$objp->socname;
 		print $companystatic->getNomUrl(1);
 		print '</td>';