From 7a6de8876266ffa03c6a16eba7aefb436b562363 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 11 Mar 2009 08:48:56 +0000
Subject: [PATCH] Fix: Bad navigation link

---
 htdocs/comm/propal.php   |  4 +++-
 htdocs/compta/propal.php | 19 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 68181895759..7c0f6db6f43 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -950,9 +950,11 @@ if ($id > 0 || ! empty($ref))
 
 	print '<table class="border" width="100%">';
 
+	$linkback="<a href=\"propal.php?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
+
 	// Ref
 	print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
-	print $html->showrefnav($propal,'ref','',1,'ref','ref','');
+	print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
 	print '</td></tr>';
 
 	// Ref client
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index d0021d9c326..3b980d73ee5 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -130,17 +130,16 @@ $formfile = new FormFile($db);
 $societestatic=new Societe($db);
 $propalstatic=new Propal($db);
 
-/*
- *
- * Mode fiche
- *
- */
-if ($_GET["propalid"] > 0)
+$now=gmmktime();
+
+$id = $_GET['propalid'];
+$ref= $_GET['ref'];
+if ($id > 0 || ! empty($ref))
 {
 	if ($mesg) print "$mesg<br>";
 
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET['propalid'],$_GET["ref"]);
 
 	$societe = new Societe($db);
 	$societe->fetch($propal->socid);
@@ -155,11 +154,11 @@ if ($_GET["propalid"] > 0)
 	 */
 	print '<table class="border" width="100%">';
 
-	$linkback='<a href="propal.php' . "?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder" .'">'.$langs->trans("BackToList")."</a>";
+	$linkback="<a href=\"propal.php?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
 
 	// Ref
 	print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
-	print $html->showrefnav($propal,'propalid',$linkback);
+	print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
 	print '</td></tr>';
 
 	// Ref client
@@ -294,7 +293,7 @@ if ($_GET["propalid"] > 0)
 		}
 		print '</tr>';
 	}
-	
+
 	// Amount
 	print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" colspan="2"><b>'.price($propal->total_ht).'</b></td>';