From 99ca686d8796cad441d091615a985f8f3cd47b91 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 5 Feb 2007 18:56:44 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20possibilit=E9=20d'ajouter=20une=20adress?=
 =?UTF-8?q?e=20de=20livraison=20m=EAme=20si=20il=20en=20existe=20d=E9j=E0?=
 =?UTF-8?q?=20une.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 5d1d9791adb..911a4a5247c 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1922,14 +1922,11 @@ class Form
             print '<input type="hidden" name="action" value="setdeliveryadress">';
             print '<table class="noborder" cellpadding="0" cellspacing="0">';
             print '<tr><td>';
-            $numaddress = $this->select_adresse_livraison($selected, $socid, $htmlname, 1);
+            $this->select_adresse_livraison($selected, $socid, $htmlname, 1);
             print '</td>';
             print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-            if ($numaddress==0)
-            {
-            	$langs->load("companies");
-              print ' &nbsp; <a href=/comm/adresse_livraison.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';
-            }
+            $langs->load("companies");
+            print ' &nbsp; <a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';
             print '</td></tr></table></form>';
         }
         else
@@ -1939,7 +1936,7 @@ class Form
             	require_once(DOL_DOCUMENT_ROOT ."/comm/adresse_livraison.class.php");
             	$livraison=new AdresseLivraison($this->db);
 				      $livraison->fetch_adresse($selected);
-				      print '<a href=/comm/adresse_livraison.php?socid='.$livraison->socid.'&idl='.$livraison->idl.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$livraison->label.'</a>';
+				      print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$livraison->socid.'&idl='.$livraison->idl.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$livraison->label.'</a>';
             }
             else
             {