Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9

Dolibarr · Aug 17, 2016 · 00443da · 00443da
2 parents a132375 + 0cb7440
commit 00443da
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
@@ -587,10 +587,13 @@
 		print dol_print_date($db->jdate($objp->date_commande), 'day');
 		print '</td>';
 
-		// Delivery date
-		print '<td align="center">';
-		print dol_print_date($db->jdate($objp->date_delivery), 'day');
-		print '</td>';
+		if (empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)) 
+		{
+			// Delivery date
+			print '<td align="center">';
+			print dol_print_date($db->jdate($objp->date_delivery), 'day');
+			print '</td>';
+		}
 
 		// Amount HT
 		print '<td align="right" class="nowrap">'.price($objp->total_ht).'</td>';