From c95f84bb03d29f595bd8637d2e4683977dd4d799 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 21 Apr 2006 13:48:18 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20de=20la=20gestion=20des=20adr?=
 =?UTF-8?q?esses=20de=20livraison?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/fiche.php             | 18 +++++++++++++++++-
 htdocs/langs/en_US/companies.lang |  3 ++-
 htdocs/langs/fr_FR/companies.lang |  3 ++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index f907bbd2ff4..b6e9f4cf28b 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -335,7 +335,23 @@ if ($socidp > 0)
 		print '<td><td align="right">';
 		print '<a href="'.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
 		print '</td></tr></table>';
-		print '</td><td colspan="3"></td>';
+		print '</td><td colspan="3">';
+		
+		$sql = "SELECT count(rowid) as nb";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
+    $sql.= " WHERE fk_soc =".$objsoc->id;
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $obj = $db->fetch_object($resql);
+        print $objsoc->nb?($objsoc->nb):$langs->trans("NoOtherDeliveryAdress");
+    }
+    else {
+        dolibarr_print_error($db);
+    }
+		print '</td>';
 		print '</tr>';
 
     print "</table>";
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index b2c1c97eb37..1d836664bab 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -153,4 +153,5 @@ DeliveryAdressLabel=Delivery adress label
 DeleteDeliveryAdress=Delete a delivery adress
 ConfirmDeletedeliveryAdress=Are you sure you want to delete this delivery adress?
 NewDeliveryAdress=New delivery adress
-AddDeliveryAdress=Add adress
\ No newline at end of file
+AddDeliveryAdress=Add adress
+NoOtherDeliveryAdress=No other delivery adress
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 79c69227308..ebd6f7bb5e9 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -154,4 +154,5 @@ DeliveryAdressLabel=Libell
 DeleteDeliveryAdress=Supprimer une adresse de livraison
 ConfirmDeletedeliveryAdress=Êtes-vous sûr de vouloir supprimer cette adresse de livraison ?
 NewDeliveryAdress=Nouvelle adresse de livraison
-AddDeliveryAdress=Ajouter l'adresse
\ No newline at end of file
+AddDeliveryAdress=Ajouter l'adresse
+NoOtherDeliveryAdress=Pas d'autre(s) adresse(s) de livraison définie(s)
\ No newline at end of file