diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 92a11c907d4..430808da074 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -64,10 +64,12 @@ function commande_prepare_head(Commande $object)
 		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipments");
-		if ($nbShipments > 0) $text.= ' <span class="badge">'.$nbShipments.'</span>';
 		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
 		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
-		if ($nbReceiption > 0) $text.= ' <span class="badge">'.$nbReceiption.'</span>';
+		if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
+		if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 25a5ac10716..bf49e8730fb 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -69,6 +69,9 @@ ALTER TABLE llx_website_page ADD COLUMN type_container varchar(16) NOT NULL DEFA
 
 -- For 7.0
 
+UPDATE llx_contrat SET ref = rowid WHERE ref IS NULL OR ref = '';
+ALTER TABLE llx_contratdet ADD COLUMN vat_src_code varchar(10) DEFAULT '';
+
 INSERT INTO llx_c_type_contact(rowid, element, source, code, libelle, active ) values (42, 'propal',  'external', 'SHIPPING', 'Customer contact for delivery', 1);
 
 ALTER TABLE llx_inventory ADD UNIQUE INDEX uk_inventory_ref (ref, entity);