From be477e869f70acb92c63b0f98b811cb40d49be24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 26 Nov 2009 22:30:41 +0000
Subject: [PATCH] Fix: Deprecated feature must not be enabled by default.

---
 htdocs/comm/fiche.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 06f7a945171..ff98deb7241 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -297,8 +297,9 @@ if ($socid > 0)
 		print '</tr>';
 	}
 
-	// Adresse de livraison
-	if ($conf->expedition->enabled)
+	// Old way to define delivery address (deprecated).
+	// Now all addresses types (like delivery addresses, invoices addresses,...) are saved as contacts.
+	if ($conf->global->PROPALE_ADD_DELIVERY_ADDRESS)	// Hidden deprecated feature.
 	{
 		print '<tr><td nowrap>';
 		print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-- 
GitLab