diff --git a/html/show_tva.php b/html/show_tva.php
index 5c7516527..1beaa01f6 100644
--- a/html/show_tva.php
+++ b/html/show_tva.php
@@ -30,7 +30,14 @@ if ( ! isset ( $g_dossier ) ) {
   phpinfo();
   exit -2;
 }
-
+?>
+<script>
+function GetIt(ctl,tva_id) {
+           self.opener.SetIt(ctl,tva_id)
+	   window.close();	
+	} 
+</script>
+<?
 
 $l_Db=sprintf("dossier%d",$g_dossier);
 $condition="";
@@ -40,12 +47,17 @@ $Max=pg_NumRows($Res);
 echo "<TABLE BORDER=\"1\">";
 for ($i=0;$i<$Max;$i++) {
   $row=pg_fetch_array($Res,$i);
-  printf("<tr><TD BGCOLOR=\LIGHTGREEN\" >%d</TD><TD>%s</TD><TD>%s</TD></TR>",
+  $set=sprintf( '<INPUT TYPE="BUTTON" Value="select" onClick="GetIt(\'%s\',\'%s\');">',
+	     $_GET['ctl'],$row['tva_id']);
+  printf("<tr><TD BGCOLOR=\LIGHTGREEN\" >%s %d</TD><TD>%s</TD><TD>%s</TD></TR>",
+	 $set,
 	 $row['tva_id'],
 	 $row['tva_label'],
 	 $row['tva_comment']);
 }
 echo '</TABLE>';
-echo '<INPUT TYPE="BUTTON" Value="Close" onClick=\'window.close()\'>';
+?>
+<input type='button' Value="fermer" onClick='window.close();'>
+<?
 html_page_stop();
 ?>
diff --git a/include/constant.php b/include/constant.php
index e1588bf86..72e4282a7 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -108,13 +108,18 @@ define ("JS_SEARCH_POSTE","<SCRIPT>function SearchPoste(p_sessid)
 	} 
 	</SCRIPT>"
 );
-define ("JS_SHOW_TVA","<SCRIPT>function ShowTva(p_sessid)
+define ("JS_SHOW_TVA","<SCRIPT>function ShowTva(p_sessid,ctl)
      {
-       var win=window.open('show_tva.php?PHPSESSID='+p_sessid,'Montre','scrollbar,toolbar=no,width=300,height=300,resizable=yes');
+       var win=window.open('show_tva.php?ctl='+ctl+'&PHPSESSID='+p_sessid,'Montre','scrollbar,toolbar=no,width=300,height=300,resizable=yes');
     } 
-	 function GetIt() {
+	 function GetIt(ctl,tva_id) {
+           self.opener.SetIt(ctl,tva_id)
 	   window.close();	
 	} 
+function SetIt(ctl,tva_id)
+{
+document.fiche.eval(ctl).value=tva_id;
+}
 	</SCRIPT>"
 );
 
@@ -123,6 +128,14 @@ define ("JS_VIEW_JRN_DETAIL","<script>function viewDetail(p_value,p_sessid)
 			var win=window.open('jrn_op_detail.php?jrn_op='+p_value+'&PHPSESSID='+p_sessid,'Cherche','toolbar=no,width=400,height=400,scrollbars=yes,resizable=yes');
 		}
 	</script>");
+define ("JS_VIEW_JRN_CANCEL","<script>function cancelOperation(p_value,p_sessid)
+		{
+			var win=window.open('annulation.php?jrn_op='+p_value+'&PHPSESSID='+p_sessid,'Cancel it','toolbar=no,width=400,height=400,scrollbars=yes,resizable=yes');
+		}
+function RefreshMe() {
+window.location.reload();
+}
+	</script>");
 define ("JS_SEARCH_CARD","
 <script>
 /* type must be cred or deb and name is
diff --git a/include/fiche_inc.php b/include/fiche_inc.php
index fc8aa60af..e40aacce1 100644
--- a/include/fiche_inc.php
+++ b/include/fiche_inc.php
@@ -158,7 +158,7 @@ function EncodeFiche($p_cn,$p_type,$p_array=null) {
 
   $ch_col="</TD><TD>";
   $ch_li='</TR><TR>';
-  echo '<FORM action="fiche.php" method="post">';
+  echo '<FORM action="fiche.php" method="post" name="fiche">';
   echo '<INPUT TYPE="HIDDEN" name="fiche" value="'.$p_type.'">';
   $l_sessid=(isset ($_POST["PHPSESSID"]))?$_POST["PHPSESSID"]:$_GET["PHPSESSID"];
 
@@ -193,7 +193,7 @@ function EncodeFiche($p_cn,$p_type,$p_array=null) {
       } 
       // Javascript for showing the tva
       if ( $l_line ['ad_id'] == ATTR_DEF_TVA ) {
-	$but_search_poste='<INPUT TYPE="BUTTON" VALUE="Montre" OnClick="ShowTva(\''.$l_sessid.'\')">';
+	$but_search_poste='<INPUT TYPE="BUTTON" VALUE="Montre" OnClick="ShowTva(\''.$l_sessid.'\', \'av_text'.$i.'\')">';
       }
       // content of the attribute
       printf ('<TR><TD> %s </TD><TD><INPUT TYPE="TEXT" NAME="av_text%d">%s %s</TD></TR>',
@@ -246,7 +246,7 @@ function EncodeFiche($p_cn,$p_type,$p_array=null) {
 	
       // Javascript for showing the tva
       if ( $l_line ['ad_id'] == ATTR_DEF_TVA ) {
-	$but_search_poste='<INPUT TYPE="BUTTON" VALUE="Montre" OnClick="ShowTva(\''.$l_sessid.'\')">';
+	$but_search_poste='<INPUT TYPE="BUTTON" VALUE="Montre" OnClick="ShowTva(\''.$l_sessid.'\',\'av_text'.$i.'\')">';
       }