--- /tmp/dsg/dolibarr/htdocs/expedition/tpl/github_19.0.3_linkedobjectblock.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/expedition/tpl/client_linkedobjectblock.tpl.php
@@ -20 +20,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -26 +27 @@
-print "<!-- BEGIN PHP TEMPLATE expedition/tpl/linkedobjectblock.tpl.php -->\n";

+print "<!-- BEGIN PHP TEMPLATE -->\n";

@@ -39,2 +40,3 @@
-foreach ($linkedObjectBlock as $key => $objectlink) {

-	$ilink++;

+foreach ($linkedObjectBlock as $key => $objectlink)

+{

+    $ilink++;

@@ -42,24 +44,25 @@
-	$trclass = 'oddeven';

-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {

-		$trclass .= ' liste_sub_total';

-	} ?>

-	<tr class="<?php echo $trclass; ?>">

-		<td><?php echo $langs->trans("Shipment"); ?></td>

-		<td><?php echo $objectlink->getNomUrl(1); ?></td>

-		<td><?php echo $objectlink->ref_customer; ?></td>

-		<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>

-		<td class="right"><?php

-		if ($user->hasRight('expedition', 'lire')) {

-			$total = $total + $objectlink->total_ht;

-			echo price($objectlink->total_ht);

-		} ?></td>

-		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>

-		<td class="right">

-			<?php

-			// For now, shipments must stay linked to order, so link is not deletable

-			if ($object->element != 'commande') {

-				?>

-			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>				<?php

-			} ?>

-	</tr>

-	<?php

+    $trclass = 'oddeven';

+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';

+    ?>

+    <tr class="<?php echo $trclass; ?>">

+        <td><?php echo $langs->trans("Shipment"); ?></td>

+        <td><?php echo $objectlink->getNomUrl(1); ?></td>

+        <td></td>

+    	<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>

+    	<td class="right"><?php

+    	if ($user->rights->expedition->lire) {

+    		$total = $total + $objectlink->total_ht;

+    		echo price($objectlink->total_ht);

+    	} ?></td>

+    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>

+    	<td class="right">

+    		<?php

+    		// For now, shipments must stay linked to order, so link is not deletable

+    		if ($object->element != 'commande') {

+    			?>

+    			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>

+    			<?php

+    		}

+    		?>

+    </tr>

+    <?php

@@ -68,11 +71,11 @@
-	?>

-	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">

-		<td><?php echo $langs->trans("Total"); ?></td>

-		<td></td>

-		<td class="center"></td>

-		<td class="center"></td>

-		<td class="right"><?php echo price($total); ?></td>

-		<td class="right"></td>

-		<td class="right"></td>

-	</tr>

-	<?php

+    ?>

+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">

+        <td><?php echo $langs->trans("Total"); ?></td>

+        <td></td>

+    	<td class="center"></td>

+    	<td class="center"></td>

+    	<td class="right"><?php echo price($total); ?></td>

+    	<td class="right"></td>

+    	<td class="right"></td>

+    </tr>

+    <?php