diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 929e7ecafd0..8de5ac787d7 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1042,6 +1042,7 @@ if ($action == 'create')
     	    while ($i < $numAsked)
     	    {
     	    	print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+                if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
     	    	$i++;
     	    }
         	print '});
@@ -1050,6 +1051,7 @@ if ($action == 'create')
     	    while ($i < $numAsked)
     	    {
     	    	print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+                if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(0);'."\n";
     	    	$i++;
     	    }
         	print '});
@@ -1072,9 +1074,12 @@ if ($action == 'create')
                 print '<td class="center">'.$langs->trans("QtyToShip");
 				if (empty($conf->productbatch->enabled))
 				{
-	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+	                print '<br><a href="#" id="autofill">'.$langs->trans("Fill").'</a>';	
+	                print ' / ';	
+				} else {
+					print '<br>';
 				}
+				print '<a href="#" id="autoreset">'.$langs->trans("Reset").'</a>';
                 print '</td>';
                 if (!empty($conf->stock->enabled))
                 {