From ff2fc6510661ba0675246c45488f385fcd878fca Mon Sep 17 00:00:00 2001
From: sparkyx <dany118@gmail.com>
Date: Mon, 4 Jul 2005 22:26:41 +0000
Subject: [PATCH] Task #4359 : Fix problem in annulation.php

---
 html/annulation.php     | 8 +++-----
 include/constant.php    | 4 ++--
 include/user_common.php | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/html/annulation.php b/html/annulation.php
index d3cb2854f..04ef83e60 100644
--- a/html/annulation.php
+++ b/html/annulation.php
@@ -39,11 +39,9 @@ if ( ! isset ( $_SESSION['g_dossier'] ) ) {
   exit -2;
 }
 
-if ( isset( $p_jrn )) {
-  $p_jrn=$p_jrn;
-  $_SESSION["p_jrn"]=$p_jrn;
-
-}
+if ( isset( $_GET['p_jrn'] )) {
+  $p_jrn=$_GET['p_jrn'];
+  }
 
  // Check privilege
  // CheckJrn verify that the user is not an admin
diff --git a/include/constant.php b/include/constant.php
index 8cf340d83..16cd35ecd 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -168,9 +168,9 @@ define ("JS_VIEW_JRN_DETAIL","<script language=\"javascript\">function viewDetai
 		}
 
 	</script>");
-define ("JS_VIEW_JRN_CANCEL","<script  language=\"javascript\" >function cancelOperation(p_value,p_sessid)
+define ("JS_VIEW_JRN_CANCEL","<script  language=\"javascript\" >function cancelOperation(p_value,p_sessid,p_jrn)
 		{
-			var win=window.open('annulation.php?jrn_op='+p_value+'&PHPSESSID='+p_sessid,'Annule','toolbar=no,width=400,height=400,scrollbars=yes,resizable=yes');
+			var win=window.open('annulation.php?p_jrn='+p_jrn+'&jrn_op='+p_value+'&PHPSESSID='+p_sessid,'Annule','toolbar=no,width=400,height=400,scrollbars=yes,resizable=yes');
 		}
 function RefreshMe() {
 window.location.reload();
diff --git a/include/user_common.php b/include/user_common.php
index 309c64891..9e6e29b8c 100644
--- a/include/user_common.php
+++ b/include/user_common.php
@@ -405,8 +405,8 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null)
 	    // TODO Add print
 	    $r.="<TD>";
 	    // cancel operation
-	    $r.=sprintf('<input TYPE="BUTTON" VALUE="%s" onClick="cancelOperation(\'%s\',\'%s\')">',
-			"Annuler",$row['jr_grpt_id'],$l_sessid);
+	    $r.=sprintf('<input TYPE="BUTTON" VALUE="%s" onClick="cancelOperation(\'%s\',\'%s\',\'%s\')">',
+			"Annuler",$row['jr_grpt_id'],$l_sessid,$p_jrn);
 	    $r.="</TD>";
 	  }
 	}