From 5f3cc714e69fddc43f939e54dc74d218524d3e4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 21 Apr 2006 23:24:06 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Correction=20typographique=20Utilisation?=
 =?UTF-8?q?=20traduction=20de=20NoOtherDeliveryAddress=20plus=20courte=20p?=
 =?UTF-8?q?our=20=E9viter=20formulaire=20tronqu=E9/surcharg=E9.=20New:=20C?=
 =?UTF-8?q?onditionnement=20de=20la=20gestion=20des=20adresses=20de=20livr?=
 =?UTF-8?q?aisons=20sur=20activation=20du=20module=20commande=20ou=20exped?=
 =?UTF-8?q?ition.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/adresse_livraison.php | 12 +++++-----
 htdocs/comm/fiche.php             | 38 ++++++++++++++++---------------
 htdocs/langs/en_US/companies.lang | 14 ++++++------
 htdocs/langs/fr_FR/companies.lang | 14 ++++++------
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/htdocs/comm/adresse_livraison.php b/htdocs/comm/adresse_livraison.php
index 9f0b523049c..57f13d70c12 100644
--- a/htdocs/comm/adresse_livraison.php
+++ b/htdocs/comm/adresse_livraison.php
@@ -192,7 +192,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
             $livraison->pays=$obj->libelle;
         }
     
-        print_titre($langs->trans("NewDeliveryAdress"));
+        print_titre($langs->trans("NewDeliveryAddress"));
         print "<br>\n";
     
         if ($livraison->error)
@@ -208,7 +208,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
     
         print '<table class="border" width="100%">';
 
-        print '<tr><td>'.$langs->trans('DeliveryAdressLabel').'</td><td><input type="text" size="30" name="label" value="'.$livraison->label.'"></td></tr>';
+        print '<tr><td>'.$langs->trans('DeliveryAddressLabel').'</td><td><input type="text" size="30" name="label" value="'.$livraison->label.'"></td></tr>';
         print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$livraison->nom.'"></td></tr>';
 
         print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
@@ -242,7 +242,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
         print '</textarea></td></tr>';
 
         print '<tr><td colspan="4" align="center">';
-        print '<input type="submit" class="button" value="'.$langs->trans('AddDeliveryAdress').'"></td></tr>'."\n";
+        print '<input type="submit" class="button" value="'.$langs->trans('AddDeliveryAddress').'"></td></tr>'."\n";
     
         print '</table>'."\n";
         print '</form>'."\n";
@@ -310,7 +310,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 
         print '<table class="border" width="100%">';
 
-        print '<tr><td>'.$langs->trans('DeliveryAdressLabel').'</td><td colspan="3"><input type="text" size="40" name="label" value="'.$livraison->label.'"></td></tr>';
+        print '<tr><td>'.$langs->trans('DeliveryAddressLabel').'</td><td colspan="3"><input type="text" size="40" name="label" value="'.$livraison->label.'"></td></tr>';
         print '<tr><td>'.$langs->trans('Name').'</td><td colspan="3"><input type="text" size="40" name="nom" value="'.$livraison->nom.'"></td></tr>';
 
         print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
@@ -367,7 +367,7 @@ else
     if ($_GET["action"] == 'delete')
     {
         $html = new Form($db);
-        $html->form_confirm("adresse_livraison.php?socid=".$livraison->socid."&amp;idl=".$_GET["idl"],$langs->trans("DeleteDeliveryAdress"),$langs->trans("ConfirmDeleteDeliveryAdress"),"confirm_delete");
+        $html->form_confirm("adresse_livraison.php?socid=".$livraison->socid."&amp;idl=".$_GET["idl"],$langs->trans("DeleteDeliveryAddress"),$langs->trans("ConfirmDeleteDeliveryAdress"),"confirm_delete");
         print "<br />\n";
     }
 
@@ -384,7 +384,7 @@ else
     
       print '<table class="border" width="100%">';
 
-      print '<tr><td width="20%">'.$langs->trans('DeliveryAdressLabel').'</td><td colspan="3">'.$livraison->lignes[$i]->label.'</td>';
+      print '<tr><td width="20%">'.$langs->trans('DeliveryAddressLabel').'</td><td colspan="3">'.$livraison->lignes[$i]->label.'</td>';
       print '<td valign="top" colspan="2" width="50%" rowspan="7">'.$langs->trans('Note').' :<br>'.nl2br($livraison->lignes[$i]->note).'</td></tr>';
       print '<tr><td width="20%">'.$langs->trans('Name').'</td><td colspan="3">'.$livraison->lignes[$i]->nom.'</td></tr>';
     
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index a7a3556bceb..bda25d377ea 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -328,33 +328,35 @@ if ($socidp > 0)
 	}
 	
 	// adresse de livraison
-
+	if ($conf->expedition->enabled || $conf->commande->enabled)
+	{
 		print '<tr><td nowrap>';
 		print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-		print $langs->trans("DeliveryAdress");
+		print $langs->trans("DeliveryAddress");
 		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">';
-		
-		$sql = "SELECT count(rowid) as nb";
-    $sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
-    $sql.= " WHERE fk_societe =".$objsoc->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $objal = $db->fetch_object($resql);
-        print $objal->nb?($objal->nb):$langs->trans("NoOtherDeliveryAdress");
-    }
-    else
-    {
-        dolibarr_print_error($db);
-    }
-    
+		$sql = "SELECT count(rowid) as nb";
+	    $sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
+	    $sql.= " WHERE fk_societe =".$objsoc->id;
+	
+	    $resql = $db->query($sql);
+	    if ($resql)
+	    {
+	        $num = $db->num_rows($resql);
+	        $objal = $db->fetch_object($resql);
+	        print $objal->nb?($objal->nb):$langs->trans("NoOtherDeliveryAddress");
+	    }
+	    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 1d836664bab..c1382344a4b 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -148,10 +148,10 @@ DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
 ExportDataset_company_1=Companies/fundations and properties
 ExportDataset_company_2=Contacts and properties
-DeliveryAdress=Delivery adress
-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
-NoOtherDeliveryAdress=No other delivery adress
\ No newline at end of file
+DeliveryAddress=Delivery address
+DeliveryAddressLabel=Delivery address label
+DeleteDeliveryAddress=Delete a delivery address
+ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
+NewDeliveryAddress=New delivery address
+AddDeliveryAddress=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 ebd6f7bb5e9..5302f408c20 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -149,10 +149,10 @@ NoDolibarrAccess=Pas d'acc
 ExportDataset_company_1=Sociétés/associations et caractéristiques
 ExportDataset_company_2=Contacts et caractéristiques
 PriceLevel=Niveau de prix
-DeliveryAdress=Adresse(s) de livraison
-DeliveryAdressLabel=Libellé de l'adresse
-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
-NoOtherDeliveryAdress=Pas d'autre(s) adresse(s) de livraison définie(s)
\ No newline at end of file
+DeliveryAddress=Adresse(s) de livraison
+DeliveryAddressLabel=Libellé de l'adresse
+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
+NoOtherDeliveryAddress=Pas d'adresses alternatives définies
\ No newline at end of file