From c1fa8287ed365f78ce99b1d0491279589e763098 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 7 Aug 2010 11:52:53 +0000
Subject: [PATCH] Works on address function

---
 htdocs/comm/propal.php                | 6 +++---
 htdocs/commande/fiche.php             | 2 +-
 htdocs/compta/commande/fiche.php      | 2 +-
 htdocs/core/class/html.form.class.php | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 259557f97d9..a92438ae9e2 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -223,7 +223,7 @@ if ($_POST['action'] == 'setdate_livraison')
 	if ($result < 0) dol_print_error($db,$propal->error);
 }
 
-if ($_POST['action'] == 'setdeliveryadress' && $user->rights->propale->creer)
+if ($_POST['action'] == 'setaddress' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
 	$propal->fetch($_GET["id"]);
@@ -1247,11 +1247,11 @@ if ($id > 0 || ! empty($ref))
 		print $langs->trans('DeliveryAddress');
 		print '</td>';
 
-		if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socid='.$propal->socid.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
+		if ($_GET['action'] != 'editdelivery_address' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_address&amp;socid='.$propal->socid.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 
-		if ($_GET['action'] == 'editdelivery_adress')
+		if ($_GET['action'] == 'editdelivery_address')
 		{
 			$html->form_address($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id);
 		}
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 0b90191304d..16c02ce7958 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -311,7 +311,7 @@ if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer)
 	}
 }
 
-if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer)
+if ($_POST['action'] == 'setaddress' && $user->rights->commande->creer)
 {
 	$commande = new Commande($db);
 	$commande->fetch($_GET['id']);
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 997a0212f88..a4d2fe31c50 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -93,7 +93,7 @@ if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer)
 	}
 }
 
-if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer)
+if ($_POST['action'] == 'setaddress' && $user->rights->commande->creer)
 {
 	$commande = new Commande($db);
 	$commande->fetch($_GET['id']);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 609c843e6a9..34516b6cc4f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2097,7 +2097,7 @@ class Form
 	}
 
 	/**
-	 *    	\brief      Affiche formulaire de selection de l'adresse de livraison
+	 *    	\brief      Affiche formulaire de selection de l'adresse
 	 *    	\param      page        	Page
 	 *    	\param      selected    	Id condition pre-selectionne
 	 *    	\param      htmlname    	Nom du formulaire select
@@ -2110,7 +2110,7 @@ class Form
 		if ($htmlname != "none")
 		{
 			print '<form method="post" action="'.$page.'">';
-			print '<input type="hidden" name="action" value="setdeliveryadress">';
+			print '<input type="hidden" name="action" value="setaddress">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
 			print '<tr><td>';