diff --git a/htdocs/comm/adresse_livraison.php b/htdocs/comm/adresse_livraison.php
index 86d2a8c65e8..0784b543580 100644
--- a/htdocs/comm/adresse_livraison.php
+++ b/htdocs/comm/adresse_livraison.php
@@ -107,6 +107,11 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
         		Header("Location: ../commande/fiche.php?action=editdelivery_adress&socid=".$socid."&id=".$originid);
         		exit;
         	}
+        	elseif ($origin == propal)
+        	{
+        		Header("Location: ../comm/propal.php?action=editdelivery_adress&socidp=".$socid."&propalid=".$originid);
+        		exit;
+        	}
         	else
         	{
             Header("Location: adresse_livraison.php?socid=".$socid);
@@ -131,9 +136,13 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
         {
         	if ($origin == commande)
         	{
-        		Header("Location: ../commande/fiche.php?&id=".$originid);
+        		Header("Location: ../commande/fiche.php?id=".$originid);
         		exit;
         	}
+        	elseif ($origin == propal)
+        	{
+        		Header("Location: ../comm/propal.php?propalid=".$originid);
+        		exit;
         	else
         	{
             Header("Location: adresse_livraison.php?socid=".$socid);
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 3d9e7c438ec..69ed7bdbaa5 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -661,7 +661,7 @@ if ($_GET['propalid'] > 0)
       	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;socidp='.$propal->socidp.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
+			  if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socidp='.$propal->socidp.'&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
 			  print '</tr></table>';
 			  print '</td><td colspan="3">';