diff --git a/include/class_fiche.php b/include/class_fiche.php
index d3e050ddf..00930701c 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -23,7 +23,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 include_once("class_attribut.php");
 require_once("class_ispan.php");
-require_once("class_itva.php");
+require_once("class_itva_popup.php");
 require_once("class_itext.php");
 require_once("class_ihidden.php");
 require_once('class_fiche_def.php');
@@ -336,6 +336,7 @@ Array
       $r='<table>';
       foreach ($array as $attr)
 		{
+		  $table=1;
 		  $msg="";
 		  if ( $attr->ad_id == ATTR_DEF_ACCOUNT)
 			{
@@ -369,9 +370,8 @@ Array
 	     }
 	  elseif ( $attr->ad_id == ATTR_DEF_TVA)
 	    {
-	      $r.=JS_SHOW_TVA;
-	      $w=new ITva();
-
+	      $w=new ITva_Popup('popup_tva');
+	      $table=0;
 	    }
 	  elseif ( $attr->ad_id == ATTR_DEF_COMPANY )
 	    {
@@ -391,7 +391,7 @@ Array
 	    {
 	      $w=new IText();
 	    }
-	  $w->table=1;
+	  $w->table=$table;
 	  $w->label=$attr->ad_text;
 	  $w->name="av_text".$attr->ad_id;
 
@@ -452,9 +452,8 @@ Array
 		}
 	      elseif ( $r->ad_id == ATTR_DEF_TVA)
 		{
-		  $ret.=JS_SHOW_TVA;
-		  $w=new ITva();
-		  $w->table=1;
+		  $w=new ITva_Popup('popup_tva');
+		  $w->table=0;
 
 	    }
 	      elseif ( $r->ad_id == ATTR_DEF_COMPANY )
diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php
index 8e3246962..73f1864d9 100644
--- a/include/compta_fin.inc.php
+++ b/include/compta_fin.inc.php
@@ -36,6 +36,10 @@ echo js_include('dragdrop.js');
 echo js_include('acc_ledger.js');
 require_once ('class_acc_ledger_fin.php');
 require_once('class_ipopup.php');
+$pop_tva=new IPopup('popup_tva');
+$pop_tva->title=_('Choix TVA');
+$pop_tva->value='';
+echo $pop_tva->input();
 
 $gDossier=dossier::id();
 $p_action=(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:'';
diff --git a/include/quick_writing.inc.php b/include/quick_writing.inc.php
index 5e8755eff..f12a17022 100644
--- a/include/quick_writing.inc.php
+++ b/include/quick_writing.inc.php
@@ -54,6 +54,10 @@ $search_card=new IPopup('ipop_card');
 $search_card->title=_('Recherche de fiche');
 $search_card->value='';
 echo $search_card->input();
+$pop_tva=new IPopup('popup_tva');
+$pop_tva->title=_('Choix TVA');
+$pop_tva->value='';
+echo $pop_tva->input();
 
 $cn=new Database(dossier::id());
 $id=(isset ($_REQUEST['p_jrn']))?$_REQUEST['p_jrn']:-1;