From ac9c49315b38ed21244d62c77eabe302e23d071c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 24 Apr 2006 10:51:32 +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/commande/fiche.php         | 8 +++++++-
 htdocs/html.form.class.php        | 1 +
 htdocs/langs/en_US/companies.lang | 1 +
 htdocs/langs/fr_FR/companies.lang | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index d457df764c1..b74d8f0398f 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -375,7 +375,13 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
     		
     		// Adresse de livraison
 		    print '<tr><td nowrap>'.$langs->trans('DeliveryAddress').'</td><td>';
-		    $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id');
+		    $numaddress = $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id');
+		    
+		    if ($numaddress==0)
+        {
+            print ' &nbsp; <a href=../comm/adresse_livraison.php?socid='.$soc->id.'&action=create>'.$langs->trans("AddAddress").'</a>';
+        }
+        
 		    print '</td></tr>';
 	
 			
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index f3d8181bcb8..4955fcdd226 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -792,6 +792,7 @@ class Form
                 }
             }
             print '</select>';
+            return $num;
         }
         else
         {
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 870ad1655e4..d76c2eb9f4b 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -154,4 +154,5 @@ DeleteDeliveryAddress=Delete a delivery address
 ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
 NewDeliveryAddress=New delivery address
 AddDeliveryAddress=Add address
+AddAddress=Add address
 NoOtherDeliveryAddress=No alternative delivery address defined
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 5302f408c20..82b7be3d9a5 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -155,4 +155,5 @@ DeleteDeliveryAddress=Supprimer une adresse de livraison
 ConfirmDeleteDeliveryAddress=Êtes-vous sûr de vouloir supprimer cette adresse de livraison ?
 NewDeliveryAddress=Nouvelle adresse de livraison
 AddDeliveryAddress=Ajouter l'adresse
+AddAddress=Ajouter adresse
 NoOtherDeliveryAddress=Pas d'adresses alternatives définies
\ No newline at end of file