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 ''; + $linkback="".$langs->trans("BackToList").""; + // Ref print ''; // 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
"; $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 '
'.$langs->trans('Ref').''; - print $html->showrefnav($propal,'ref','',1,'ref','ref',''); + print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); print '
'; - $linkback=''.$langs->trans("BackToList").""; + $linkback="".$langs->trans("BackToList").""; // Ref print ''; // Ref client @@ -294,7 +293,7 @@ if ($_GET["propalid"] > 0) } print ''; } - + // Amount print ''; print '';
'.$langs->trans('Ref').''; - print $html->showrefnav($propal,'propalid',$linkback); + print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); print '
'.$langs->trans('AmountHT').''.price($propal->total_ht).'