diff --git a/html/print_balance.php b/html/print_balance.php
index bc2c152f6..973169a23 100644
--- a/html/print_balance.php
+++ b/html/print_balance.php
@@ -49,10 +49,10 @@ if ( $User->CheckAction($cn,BALANCE) == 0)
     NoAccess();
     exit;
   }
-echo_debug(__FILE__,__LINE__,"imp pdf journaux");
+echo_debug('print_balance.php',__LINE__,"imp pdf journaux");
 foreach ($HTTP_POST_VARS as $key=>$element) {
   ${"$key"}=$element;
-  echo_debug(__FILE__,__LINE__,"key => $key element $element");
+  echo_debug('print_balance.php',__LINE__,"key => $key element $element");
 }
 // if centralized
 $t_cent="";
diff --git a/html/print_invoice.php b/html/print_invoice.php
index 38d99f325..b3a01b7cb 100644
--- a/html/print_invoice.php
+++ b/html/print_invoice.php
@@ -37,11 +37,11 @@ include_once("class.ezpdf.php");
 include_once("impress_inc.php");
 include_once("fiche_inc.php");
 include_once("user_common.php");
-echo_debug(__FILE__,__LINE__,"imp pdf journaux");
+echo_debug('print_invoice.php',__LINE__,"imp pdf journaux");
 $cn=DbConnect($g_dossier);
 foreach ($HTTP_POST_VARS as $key=>$element) {
   ${"$key"}=$element;
-  echo_debug(__FILE__,__LINE__,"key => $key element $element");
+  echo_debug('print_invoice.php',__LINE__,"key => $key element $element");
 }
 
 $amount=0.0;
@@ -74,9 +74,9 @@ for ($i=0;$i<$nb_item;$i++) {
 $a_vat=ComputeVat($cn,	$a_good,$a_quant,$a_price,$a_vat);
 $sum_vat=0.0;
 foreach ( $a_vat as $element => $t) {
-  echo_debug(__FILE__,__LINE__," a_vat element $element t $t");
+  echo_debug('print_invoice.php',__LINE__," a_vat element $element t $t");
   $sum_vat+=$t;
-  echo_debug(__FILE__,__LINE__,"sum_vat = $sum_vat");
+  echo_debug('print_invoice.php',__LINE__,"sum_vat = $sum_vat");
 }
 
 $ret="";
@@ -115,7 +115,7 @@ $pdf->ezTable($a_good_detail,null,'Detail invoice',
 $sum_detail[0] = array ('label'=>'Total HTVA ','amount'=>$amount);
 $index=1;
 foreach ( $a_vat as $element => $t) {
-  echo_debug(__FILE__,__LINE__," a_vat element $element t $t");
+  echo_debug('print_invoice.php',__LINE__," a_vat element $element t $t");
   $a_tva_sum=GetTvaRate($cn,$element);
   $sum_detail[++$index]=array('label'=>"tva ". $a_tva_sum['tva_label'],'amount'=>$t);
 }
diff --git a/html/send_jrn_pdf.php b/html/send_jrn_pdf.php
index ea772ca8c..bba8c9652 100644
--- a/html/send_jrn_pdf.php
+++ b/html/send_jrn_pdf.php
@@ -33,7 +33,7 @@ include_once("postgres.php");
 include_once("class.ezpdf.php");
 include_once("impress_inc.php");
 include_once("preference.php");
-echo_debug(__FILE__,__LINE__,"imp pdf journaux");
+echo_debug('send_jrn_pdf.php',__LINE__,"imp pdf journaux");
 $l_Db=sprintf("dossier%d",$g_dossier);
 $cn=DbConnect($g_dossier);
 $l_type="JRN";
@@ -58,14 +58,14 @@ $rap_deb=0;$rap_cred=0;
 while (1) {
   $a=0;
   list ($a_jrn,$tot_deb,$tot_cred)=GetDataJrnPdf($cn,$HTTP_GET_VARS,$limit,$offset);
-  echo_debug(__FILE__,__LINE__,"Total debit $tot_deb,credit $tot_cred");
+  echo_debug('send_jrn_pdf.php',__LINE__,"Total debit $tot_deb,credit $tot_cred");
 
   if ( $a_jrn==null) break;
   $offset+=$step; 
   foreach ($a_jrn as $key=>$element) {
-    echo_debug(__FILE__,__LINE__,"$key => $element");
+    echo_debug('send_jrn_pdf.php',__LINE__,"$key => $element");
     foreach ($element as $c1=>$c2) 
-      echo_debug(__FILE__,__LINE__,"Array is $c1 => $c2");
+      echo_debug('send_jrn_pdf.php',__LINE__,"Array is $c1 => $c2");
   }
   $first_id=$a_jrn[0]['j_id'];
    $Exercice=GetExercice($cn,$a_jrn[0]['periode']);
@@ -75,8 +75,8 @@ while (1) {
 				     $_GET['filter'],
 				     $l_centr
 				     );
-  echo_debug(__FILE__,__LINE__,"MONTANT $rap_deb,$rap_cred");
-  echo_debug(__FILE__,__LINE__,"  list($rap_deb,$rap_cred)=GetRappel($cn,$first_id,".$_GET["p_id"].",$Exercice,FIRST)");
+  echo_debug('send_jrn_pdf.php',__LINE__,"MONTANT $rap_deb,$rap_cred");
+  echo_debug('send_jrn_pdf.php',__LINE__,"  list($rap_deb,$rap_cred)=GetRappel($cn,$first_id,".$_GET["p_id"].",$Exercice,FIRST)");
   $pdf->ezText($name_jrn,30);
 
   if (  $l_centr == 1 ) {
@@ -100,7 +100,7 @@ while (1) {
   $a=1;
   // Total Page
   $apage=array(array('deb'=>sprintf("%8.2f",$tot_deb),'cred'=>$tot_cred));
-  foreach ($apage as $key=>$element) echo_debug(__FILE__,__LINE__,"apage $key => $element");
+  foreach ($apage as $key=>$element) echo_debug('send_jrn_pdf.php',__LINE__,"apage $key => $element");
   $pdf->ezTable($apage,
 		array (
 		       'deb'=> 'Total Débit',
diff --git a/html/send_poste_pdf.php b/html/send_poste_pdf.php
index c5241400f..b2a831e27 100644
--- a/html/send_poste_pdf.php
+++ b/html/send_poste_pdf.php
@@ -27,7 +27,7 @@
     include_once("class.ezpdf.php");
     include_once("impress_inc.php");
 include("poste.php");
-    echo_debug(__FILE__,__LINE__,"imp pdf journaux");
+    echo_debug('send_poste_pdf.php',__LINE__,"imp pdf journaux");
     $cn=DbConnect($g_dossier);
 foreach ($HTTP_POST_VARS as $key=>$element) {
   ${"$key"}=$element;
diff --git a/html/user_advanced.php b/html/user_advanced.php
index 3566934d8..9123628d1 100644
--- a/html/user_advanced.php
+++ b/html/user_advanced.php
@@ -33,7 +33,7 @@ $User=new cl_user($rep);
 $User->Check();
 
 include_once ("postgres.php");
-echo_debug(__FILE__,__LINE__,"user is ".$_SESSION['g_user']);
+echo_debug('user_advanced.php',__LINE__,"user is ".$_SESSION['g_user']);
 $rep=DbConnect();
 include_once ("class_user.php");
 $User=new cl_user($rep);
diff --git a/html/user_compta.php b/html/user_compta.php
index 02b842da3..575a05a01 100644
--- a/html/user_compta.php
+++ b/html/user_compta.php
@@ -32,7 +32,7 @@ html_page_start($User->theme);
 if ( isset ( $_GET['dos'] ) ) {
   $g_dossier=$_GET['dos'];
   $_SESSION[ "g_dossier"]=$g_dossier;
-  echo_debug(__FILE__,__LINE__,"admin_dossier = $g_dossier ");
+  echo_debug('user_compta.php',__LINE__,"admin_dossier = $g_dossier ");
   $g_name=GetDossierName($g_dossier);
   $_SESSION["g_name"]=$g_name;
 
@@ -40,7 +40,7 @@ if ( isset ( $_GET['dos'] ) ) {
   echo "You must choose a Dossier ";
   exit -2;
 }
-echo_debug(__FILE__,__LINE__,"user is ".$_SESSION['g_user']);
+echo_debug('user_compta.php',__LINE__,"user is ".$_SESSION['g_user']);
 
 // Synchronize rights
 SyncRight($_SESSION['g_dossier'],$_SESSION['g_user']);
diff --git a/include/form_inc.php b/include/form_inc.php
index e213e1298..a10201a07 100644
--- a/include/form_inc.php
+++ b/include/form_inc.php
@@ -247,7 +247,7 @@ function UpdateForm($p_cn,$p_array) {
     }
     if ( ${"pos$i"} > $line || ${"pos$i"} < 0) { 
       ${"pos$i"}=$i+1;
-      echo_debug(__FILE__,__LINE__,"position trop grand max = $line+1 ");
+      echo_debug('form_inc.php',__LINE__,"position trop grand max = $line+1 ");
     }
   }
   for ($i =0; $i <$line;$i++) {
diff --git a/include/import_inc.php b/include/import_inc.php
index 7e6b5efac..d5ad7f74c 100644
--- a/include/import_inc.php
+++ b/include/import_inc.php
@@ -140,17 +140,17 @@ function TransferCSV($p_cn, $periode){
 		StartSql($p_cn);
 
 		$r=InsertJrnx($p_cn,"d",$p_user,$jrn,$bq_account,$date_exec,$montant,$seq,$periode);
-		if ( $r == false) { $Rollback($p_cn);exit("error __FILE__ __LINE__");}
+		if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");}
 	
 		$r=InsertJrnx($p_cn,"c",$p_user,$jrn,$poste_comptable,$date_exec,$montant,$seq,$periode);
-		if ( $r == false) { $Rollback($p_cn);exit("error __FILE__ __LINE__");}
+		if ( $r == false) { $Rollback($p_cn);exit("error 'import_inc.php' __LINE__");}
 
 		//remove annoying double-quote
 		$num_compte=str_replace('"','',$num_compte);
 		$code=str_replace('\"','',$code);
 	
 		$r=InsertJrn($p_cn,$date_exec,NULL,$jrn,$num_compte." ".$code,$montant,$seq,$periode);
-		if ( $r == false ) { Rollback($p_cn); exit(" Error __FILE__ __LINE__");}
+		if ( $r == false ) { Rollback($p_cn); exit(" Error 'import_inc.php' __LINE__");}
 		  
 		//$sql = "insert into jrn (jr_def_id,jr_montant,jr_comment,jr_date,jr_grpt_id,jr_tech_per) values ( ".$p_jrn.", abs(".round($montant,2)."), '".$num_compte." ".$code."','".$date_valeur."','".$seq."','".$periode."')";
 		SetInternalCode($p_cn,$seq,$jrn);
diff --git a/include/impress_fiche.php b/include/impress_fiche.php
index fbc8f5fd8..4b93c028f 100644
--- a/include/impress_fiche.php
+++ b/include/impress_fiche.php
@@ -31,7 +31,7 @@ if  ( isset ($_REQUEST['fd_id'])) {
   $with_amount= (isset($_REQUEST['with_amount']))?true:false;
   if ($with_amount) 
     include_once("class_poste.php");
-  //echo '<div class="redcontent">';
+
   echo "<div>";
   $submit=new widget();
   $hid=new widget("hidden");
@@ -78,7 +78,7 @@ if  ( isset ($_REQUEST['fd_id'])) {
   $fiche=new fiche($cn);
   $e=$fiche->GetByType($fiche_def->id);
   $l=var_export($e,true);
-  echo_debug(__FILE__,__LINE__,$l);
+  echo_debug('impress_fiche.php',__LINE__,$l);
   $old=-1;
   echo "<TABLE class=\"result\">";
   echo "<TR>";
diff --git a/include/impress_inc.php b/include/impress_inc.php
index 5de90af4f..7255f4598 100644
--- a/include/impress_inc.php
+++ b/include/impress_inc.php
@@ -37,7 +37,7 @@ function ViewImp($p_array,$p_cn) {
   include_once("preference.php");
   $periode=FormPeriodeMult($p_cn);
   foreach ( $p_array as $key=>$element) {
-    echo_debug(__FILE__,__LINE__,"VIEWIMP $key $element");
+    echo_debug('impress_inc.php',__LINE__,"VIEWIMP $key $element");
     ${"$key"}=$element;
   }
   if ( ! isset($type) ) return;
@@ -118,7 +118,7 @@ function ImpHtml($p_array,$p_cn)
 {
   foreach($p_array as $key=>$element) {
     ${"$key"}=$element;
-    echo_debug(__FILE__,__LINE__,"ImpHtml $key => $element");
+    echo_debug('impress_inc.php',__LINE__,"ImpHtml $key => $element");
   }
 
 
@@ -214,7 +214,7 @@ function ImpHtml($p_array,$p_cn)
   if ($type=="jrn") {
     if ( !isset ($periode)) return NO_PERIOD_SELECTED;
 
-    echo_debug(__FILE__,__LINE__,"imp html journaux");
+    echo_debug('impress_inc.php',__LINE__,"imp html journaux");
     $ret="";
     if (isset($filter)) {
       $array=GetDataJrn($p_cn,$p_array,$filter);
@@ -420,7 +420,7 @@ function CreatePeriodeCond($p_periode,$p_field=" j_tech_per") {
  */ 
 function GetDataJrnPdf($p_cn,$p_array,$p_limit,$p_offset)
 {
-  echo_debug(__FILE__,__LINE__,"GetDataJrnPdf");
+  echo_debug('impress_inc.php',__LINE__,"GetDataJrnPdf");
 
   if ( !isset ($p_array['periode']) ) return NO_PERIOD_SELECTED;
 
@@ -521,8 +521,8 @@ function GetDataJrnPdf($p_cn,$p_array,$p_limit,$p_offset)
     $jr_montant=($line['jr_montant']!=0)?sprintf("% 8.2f",$line['jr_montant']):"";
     $tot_deb+=$line['deb_montant'];
     $tot_cred+=$line['cred_montant'];
-    echo_debug(__FILE__,__LINE__," GetJrnDataPdf : mont_Deb ".$mont_deb);
-    echo_debug(__FILE__,__LINE__," GetJrnDataPdf : mont_cred ".$mont_cred);
+    echo_debug('impress_inc.php',__LINE__," GetJrnDataPdf : mont_Deb ".$mont_deb);
+    echo_debug('impress_inc.php',__LINE__," GetJrnDataPdf : mont_cred ".$mont_cred);
 
     if ( $case != $line['grp'] ) {
       $case=$line['grp'];
@@ -562,7 +562,7 @@ function GetDataJrnPdf($p_cn,$p_array,$p_limit,$p_offset)
       
 
   }
-  echo_debug(__FILE__,__LINE__,"Total debit $tot_deb,credit $tot_cred");
+  echo_debug('impress_inc.php',__LINE__,"Total debit $tot_deb,credit $tot_cred");
   $a=array($array,$tot_deb,$tot_cred);
  return $a;
 }
@@ -656,7 +656,7 @@ function GetRappel($p_cn,$p_jrnx_id,$p_jrn_id,$p_exercice,$which,$p_type,$p_cent
 	$line=pg_fetch_array($Res,0);
 	$cred=$line['tot_amount'];
       }
-      echo_debug(__FILE__,__LINE__,"MONTANT $deb,$cred");
+      echo_debug('impress_inc.php',__LINE__,"MONTANT $deb,$cred");
       $a=array($deb,$cred);
       return $a;
 
@@ -691,7 +691,7 @@ function GetRappel($p_cn,$p_jrnx_id,$p_jrn_id,$p_exercice,$which,$p_type,$p_cent
 	$line=pg_fetch_array($Res,0);
 	$cred=$line['tot_amount'];
       }
-      echo_debug(__FILE__,__LINE__,"MONTANT $deb,$cred");
+      echo_debug('impress_inc.php',__LINE__,"MONTANT $deb,$cred");
       $a=array($deb,$cred);
       return $a;
     } // central == 1
@@ -768,7 +768,7 @@ function ParseFormula($p_cn,$p_label,$p_formula,$p_start,$p_end,$p_eval=true) {
   // $p_eval is true then we eval and returns result
   if ( $p_eval == true) {
     $p_formula="\$result=".$p_formula.";";
-    echo_debug(__FILE__,__LINE__, $p_formula);
+    echo_debug('impress_inc.php',__LINE__, $p_formula);
     
     eval("$p_formula");
     $aret=array('desc'=>$p_label,
diff --git a/include/impress_jrn.php b/include/impress_jrn.php
index 3e050e591..fa58620aa 100644
--- a/include/impress_jrn.php
+++ b/include/impress_jrn.php
@@ -29,7 +29,7 @@ include("class_jrn.php");
  $p_cent=( isset ( $_POST['cent']) )?'on':'off';
   // $POST=from_periode, to_periode, jrn_id, cent
  $d=var_export($_POST,true);
- echo_debug(__FILE__,__LINE__,$d);
+ echo_debug('impress_jrn.php',__LINE__,$d);
   $Jrn=new jrn($cn,$_POST['jrn_id']);
   $Jrn->GetName();
   if ( $_POST['p_simple']==0 ) 
diff --git a/include/jrn.php b/include/jrn.php
index ccf011dd7..64e04099b 100644
--- a/include/jrn.php
+++ b/include/jrn.php
@@ -37,7 +37,7 @@ function RecordJrn($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array = nul
   include_once("postgres.php");
   include_once("preference.php");
 
-  echo_debug(__FILE__,__LINE__,"RecordJrn($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array,$p_update)");
+  echo_debug('jrn.php',__LINE__,"RecordJrn($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array,$p_update)");
   for ( $i = 0; $i < $p_MaxDeb; $i++) {
       ${"e_class_deb$i"}=0;
       ${"e_mont_deb$i"}=0;
@@ -89,7 +89,7 @@ function RecordJrn($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array = nul
     $SqlDeb="select pcm_val,pcm_lib from tmp_pcmn where ";
     foreach ( $valid_deb as $item_deb) {
       if ( strlen (trim($item_deb))) {
-	echo_debug(__FILE__,__LINE__,"l_line[jrn_def_class_deb] $l_line[jrn_def_class_deb] item_deb $item_deb");
+	echo_debug('jrn.php',__LINE__,"l_line[jrn_def_class_deb] $l_line[jrn_def_class_deb] item_deb $item_deb");
 	if ( strstr($item_deb,"*") == true ) {
 	  $item_deb=strtr($item_deb,"*","%");
 	  $Sql=" pcm_val like '$item_deb' or";
@@ -104,7 +104,7 @@ function RecordJrn($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array = nul
     {
       $SqlDeb="select pcm_val,pcm_lib from tmp_pcmn  order by pcm_val::text";
     }
-  echo_debug(__FILE__,__LINE__,"SqlDeb $SqlDeb");
+  echo_debug('jrn.php',__LINE__,"SqlDeb $SqlDeb");
   $Res=ExecSql($cn,$SqlDeb);
   $Count=pg_NumRows($Res);
 
@@ -158,7 +158,7 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
     $SqlCred="select pcm_val,pcm_lib from tmp_pcmn where ";
     foreach ( $valid_cred as $item_cred) {
       if ( strlen (trim($item_cred))) {
-	echo_debug(__FILE__,__LINE__,"l_line[jrn_def_class_cred] $l_line[jrn_def_class_cred] item_cred $item_cred");
+	echo_debug('jrn.php',__LINE__,"l_line[jrn_def_class_cred] $l_line[jrn_def_class_cred] item_cred $item_cred");
 	if ( strstr($item_cred,"*") == true ) {
 	  $item_cred=strtr($item_cred,"*","%");
 	  $Sql=" pcm_val like '$item_cred' or";
@@ -173,7 +173,7 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
     {
       $SqlCred="select pcm_val,pcm_lib from tmp_pcmn  order by pcm_val::text";
     }
-  echo_debug(__FILE__,__LINE__,"SqlCred $SqlCred");
+  echo_debug('jrn.php',__LINE__,"SqlCred $SqlCred");
   $Res=ExecSql($cn,$SqlCred);
   $Count=pg_NumRows($Res);
 
@@ -221,7 +221,7 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
   }
 
   $search='<INPUT TYPE="BUTTON" VALUE="Cherche" OnClick="SearchJrn(\''.$sessid."','rapt')\">";
-  echo_debug(__FILE__,__LINE__,"search $search");
+  echo_debug('jrn.php',__LINE__,"search $search");
   // To avoid problem with unknown variable
   if ( ! isset ($e_rapt) ) {
   	$e_rapt="";
@@ -278,7 +278,7 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
  */ 
  function UpdateJrn($p_cn,$p_jr_id)
 {
-  echo_debug(__FILE__,__LINE__,"function UpdateJrn");
+  echo_debug('jrn.php',__LINE__,"function UpdateJrn");
 
   $l_array=GetDataJrnJrId($p_cn,$p_jr_id);
   if ( $l_array == null ) {
@@ -411,10 +411,10 @@ if ( $p_update == 0 )  echo "<TR><TD> <INPUT TYPE=\"SUBMIT\" VALUE=\"+ de line\"
 
 function ViewRec($p_array = null) {
   if ($p_array == null) { 
-    echo_debug(__FILE__,__LINE__,"p_array is null");
+    echo_debug('jrn.php',__LINE__,"p_array is null");
   }else {
     foreach ( $p_array as $n=>$e) {
-      echo_debug(__FILE__,__LINE__,"a[$n]= $e");
+      echo_debug('jrn.php',__LINE__,"a[$n]= $e");
     }
  
   }
@@ -454,10 +454,10 @@ function CorrectRecord($p_dossier,$p_user,$p_jrn,$p_MaxDeb,$p_MaxCred,$p_array)
 function ViewRecord ($p_dossier,$p_jrn,$p_id,$p_MaxDeb,$p_MaxCred,$p_array)
 {
   echo_debug ("ViewRecord : $p_dossier");
-  echo_debug(__FILE__,__LINE__,"function ViewRecord ($p_dossier,$p_jrn,$p_id,$p_MaxCred,$p_MaxDeb,$p_array)");
+  echo_debug('jrn.php',__LINE__,"function ViewRecord ($p_dossier,$p_jrn,$p_id,$p_MaxCred,$p_MaxDeb,$p_array)");
   foreach ( $p_array as $key=>$element) {
     ${"e_$key"}=$element;
-    echo_debug(__FILE__,__LINE__," e_$key=$element;");
+    echo_debug('jrn.php',__LINE__," e_$key=$element;");
 
   }
   // Get Jrn's Prop
@@ -578,7 +578,7 @@ function GetJrnProp($p_dossier,$p_jrn,$is_connected=0)
  *
  */ 
 function ViewJrn($p_dossier,$p_user,$p_jrn,$p_url,$p_array=null) {
-  echo_debug(__FILE__,__LINE__,"function ViewJrn($p_dossier,$p_user,$p_jrn,$p_array=null) ");
+  echo_debug('jrn.php',__LINE__,"function ViewJrn($p_dossier,$p_user,$p_jrn,$p_array=null) ");
   echo JS_VIEW_JRN_DETAIL;
   $db=sprintf("dossier%d",$p_dossier);
   $l_prop=GetJrnProp($p_dossier,$p_jrn);
@@ -706,7 +706,7 @@ function ViewJrn($p_dossier,$p_user,$p_jrn,$p_url,$p_array=null) {
  *
  */ 
 function GetData ($p_cn,$p_grpt) {
-  echo_debug(__FILE__,__LINE__,"GetData $p_cn $p_grpt");
+  echo_debug('jrn.php',__LINE__,"GetData $p_cn $p_grpt");
   $Res=ExecSql($p_cn,"select 
                         to_char(j_date,'DD.MM.YYYY') as j_date,
                         j_text,
@@ -840,7 +840,7 @@ function VerifData($p_cn,$p_array,$p_user)
   // Montre ce qu'on a encodé et demande vérif
   $next="";
   foreach ( $p_array as $name=>$element ) {
-      echo_debug(__FILE__,__LINE__,"element $name -> $element ");
+      echo_debug('jrn.php',__LINE__,"element $name -> $element ");
       // Sauve les données dans des variables
       ${"p_$name"}=$element;
     }
@@ -881,7 +881,7 @@ function VerifData($p_cn,$p_array,$p_user)
       if ( isset ( ${"p_mont_deb$i"} ))
 	$tot_deb+=${"p_mont_deb$i"};
     }
-    echo_debug(__FILE__,__LINE__,"Amont = 	$tot_deb $tot_cred");
+    echo_debug('jrn.php',__LINE__,"Amont = 	$tot_deb $tot_cred");
     if ( round($tot_deb,2) != round($tot_cred,2) ) { 
       return DIFF_AMOUNT;
     }
@@ -968,7 +968,7 @@ function SetInternalCode($p_cn,$p_grpt,$p_jrn)
  *
  */ 
 function GetDataJrnJrId ($p_cn,$p_jr_id) {
-  echo_debug(__FILE__,__LINE__,"GetDataJrn $p_cn $p_jr_id");
+  echo_debug('jrn.php',__LINE__,"GetDataJrn $p_cn $p_jr_id");
   $Res=ExecSql($p_cn,"select 
                         j_text,
                         j_debit,
@@ -992,7 +992,7 @@ function GetDataJrnJrId ($p_cn,$p_jr_id) {
                          jr_id=$p_jr_id 
                       order by j_debit desc");
   $MaxLine=pg_NumRows($Res);
-  echo_debug(__FILE__,__LINE__,"Found $MaxLine lines");
+  echo_debug('jrn.php',__LINE__,"Found $MaxLine lines");
   if ( $MaxLine == 0 ) return null;
 
   for ( $i=0; $i < $MaxLine; $i++) {
diff --git a/include/postgres.php b/include/postgres.php
index 809f3f07c..42653a8b1 100644
--- a/include/postgres.php
+++ b/include/postgres.php
@@ -50,7 +50,7 @@ function ShowDossier($p_type,$p_first=0,$p_max=10,$p_Num=0) {
   $l_sql=$l_sql.$l_step;
   $p_res=ExecSql($cn,$l_sql);
 
-  echo_debug(__FILE__,__LINE__,"ShowDossier:".$p_res." Line = $p_Num");
+  echo_debug('postgres.php',__LINE__,"ShowDossier:".$p_res." Line = $p_Num");
 
   $Max=pg_NumRows($p_res);
   if ( $Max == 0 ) return null;
@@ -87,7 +87,7 @@ function DbConnect($p_db=-1,$p_type='dossier') {
   }
   $password=phpcompta_password;
   $a=pg_connect("dbname=$l_dossier host=127.0.0.1 user='phpcompta' password='$password'");
-  echo_debug (__FILE__,__LINE__,"connect to $p_db dbname $l_dossier");
+  echo_debug ('postgres.php',__LINE__,"connect to $p_db dbname $l_dossier");
   return $a;
 }
 /* function ExecSql
@@ -97,7 +97,7 @@ function DbConnect($p_db=-1,$p_type='dossier') {
  * return false if error otherwise true
  */
 function ExecSql($p_connection, $p_string) {
-  echo_debug(__FILE__,__LINE__,"SQL = $p_string");
+  echo_debug('postgres.php',__LINE__,"SQL = $p_string");
   // probl. with Ubuntu & UTF8
   //----
   pg_set_client_encoding($p_connection,'latin1');
@@ -115,10 +115,10 @@ function ExecSql($p_connection, $p_string) {
  * as an array
  */
 function GetAllUser() {
-  echo_debug(__FILE__,__LINE__,"GetUser");
+  echo_debug('postgres.php',__LINE__,"GetUser");
   $cn=DbConnect();
   $sql="select * from ac_users where use_login!='phpcompta'";
-  echo_debug(__FILE__,__LINE__,"ExecSql");
+  echo_debug('postgres.php',__LINE__,"ExecSql");
   $Res=ExecSql($cn,$sql);
   $Num=pg_NumRows($Res);
   if ( $Num == 0 ) return null;
@@ -152,7 +152,7 @@ function GetPriv($p_dossier,$p_login)
 			inner join ac_users on ac_users.use_id=jnt_use_dos.use_id
                     where use_login='$p_login' and dos_id=$p_dossier");
   $Num=pg_NumRows($Res);
-  echo_debug(__FILE__,__LINE__,"Found ".$Num." rows in GetPriv");
+  echo_debug('postgres.php',__LINE__,"Found ".$Num." rows in GetPriv");
   if ( $Num==0) { return 0;}
   for($i=0;$i < $Num;$i++) {
     $Right=pg_fetch_array($Res,$i); 
@@ -361,11 +361,11 @@ function GetModeleId($p_cn,$p_modname) {
  *         $p_sql sql query
  */
 function GetArray($p_cn,$p_sql) {
-  echo_debug(__FILE__,__LINE__,"GetArray");
+  echo_debug('postgres.php',__LINE__,"GetArray");
   $r=ExecSql($p_cn,$p_sql);
   if ( ($Max=  pg_NumRows($r)) == 0 ) return null;
   $array=pg_fetch_all($r);
-  echo_debug(__FILE__,__LINE__,var_export($array,true));
+  echo_debug('postgres.php',__LINE__,var_export($array,true));
   return $array;
 }
 /* function save_upload_document
@@ -378,7 +378,7 @@ function GetArray($p_cn,$p_sql) {
 function save_upload_document ($cn,$seq) {
 
   $new_name=tempnam('/tmp','pj');
-  echo_debug(__FILE__,__LINE__,"new name=".$new_name);
+  echo_debug('postgres.php',__LINE__,"new name=".$new_name);
   if ( strlen ($_FILES['pj']['tmp_name']) != 0 ) {
       if (move_uploaded_file($_FILES['pj']['tmp_name'],
 			     $new_name)) {
@@ -386,11 +386,11 @@ function save_upload_document ($cn,$seq) {
 
 	$oid= pg_lo_import($cn,$new_name);
 	if ( $oid == false ) {
-	  echo_error(__FILE__,__LINE__,"cannot upload document");
+	  echo_error('postgres.php',__LINE__,"cannot upload document");
 	  Rollback($cn);
 	  return;
 	}
-	echo_debug(__FILE__,__LINE__,"Loading document");
+	echo_debug('postgres.php',__LINE__,"Loading document");
 	// Remove old document
 	$ret=ExecSql($cn,"select jr_pj from jrn where jr_grpt_id=$seq");
 	if (pg_num_rows($ret) != 0) {
diff --git a/include/user_action_ach.php b/include/user_action_ach.php
index 9b0693752..3b8527676 100644
--- a/include/user_action_ach.php
+++ b/include/user_action_ach.php
@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
-echo_debug(__FILE__,__LINE__,"include user_action_ach.php");
+echo_debug('user_action_ach.php',__LINE__,"include user_action_ach.php");
 require_once("user_form_ach.php");
 require_once ("preference.php");
 require_once ("user_common.php");
diff --git a/include/user_action_fin.php b/include/user_action_fin.php
index 7394ae677..8380622d9 100644
--- a/include/user_action_fin.php
+++ b/include/user_action_fin.php
@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
-echo_debug(__FILE__,__LINE__,"include user_action_fin.php");
+echo_debug('user_action_fin.php',__LINE__,"include user_action_fin.php");
 // include_once("form_input.php");
 require_once("user_form_fin.php");
 include_once("class_widget.php");
diff --git a/include/user_action_gl.php b/include/user_action_gl.php
index bf15b6f46..1587d42b5 100644
--- a/include/user_action_gl.php
+++ b/include/user_action_gl.php
@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
-echo_debug(__FILE__,__LINE__,"include user_action_gl.php");
+echo_debug('user_action_gl.php',__LINE__,"include user_action_gl.php");
 
 include_once ("preference.php");
 include_once ("user_common.php");
diff --git a/include/user_action_ods.php b/include/user_action_ods.php
index efe82b422..c08fbb375 100644
--- a/include/user_action_ods.php
+++ b/include/user_action_ods.php
@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
-echo_debug(__FILE__,__LINE__,"include user_action_ods.php");
+echo_debug('user_action_ods.php',__LINE__,"include user_action_ods.php");
 include_once("user_form_ods.php");
 include_once("class_widget.php");
 
diff --git a/include/user_action_ven.php b/include/user_action_ven.php
index bd4c3c35f..34fdb2e8c 100644
--- a/include/user_action_ven.php
+++ b/include/user_action_ven.php
@@ -18,7 +18,7 @@
 */
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
-echo_debug(__FILE__,__LINE__,"include user_action_ven.php");
+echo_debug('user_action_ven.php',__LINE__,"include user_action_ven.php");
 require_once("user_form_ven.php");
 include_once("class_widget.php");
 $cn=DbConnect($_SESSION['g_dossier']);
@@ -34,7 +34,7 @@ if ( $action == 'insert_vente' ) {
    
     // Add item
         if (isset($_POST["add_item"]) ) {
-	  echo_debug(__FILE__,__LINE__,"Add an item");
+	  echo_debug('user_action_ven.php',__LINE__,"Add an item");
 	  $nb_number=$_POST["nb_item"];
 	  $nb_number++;
 	  
@@ -65,7 +65,7 @@ if ( $action == 'insert_vente' ) {
     // We want a blank form
     if ( $blank==1)
       {
-      echo_debug(__FILE__,__LINE__,"Blank form");
+      echo_debug('user_action_ven.php',__LINE__,"Blank form");
       // Show an empty form of invoice
       $form=FormVenInput($cn,$_GET['p_jrn'],$User->GetPeriode(),null,false);
       echo '<div class="u_redcontent">';
diff --git a/include/user_form_ods.php b/include/user_form_ods.php
index c2c390690..7f3773df4 100644
--- a/include/user_form_ods.php
+++ b/include/user_form_ods.php
@@ -198,7 +198,7 @@ function FormODS($p_cn,$p_jrn,$p_periode,$p_submit,$p_array=null,$pview_only=tru
   $r.="</FORM>";
   //TODO if view only show total
   $tmp= abs($sum_deb-$sum_cred);
-  echo_debug(__FILE__,__LINE__,"Diff = ".$tmp);
+  echo_debug('user_form_ods.php',__LINE__,"Diff = ".$tmp);
   if ( abs($sum_deb-$sum_cred) > 0.0001  and $pview_only==true) {
     $msg=sprintf("Montant non correspondant credit = %.5f debit = %.5f diff = %.5f",
 		 $sum_cred,$sum_deb,$sum_cred-$sum_deb);
@@ -264,11 +264,11 @@ function RecordODS($p_cn,$p_array,$p_user,$p_jrn)
 
     if ( ${"e_account$i"."_amount"} == 0 ) continue;
     if ( ($j_id=InsertJrnx($p_cn,${"e_account$i"."_type"},$p_user->id,$p_jrn,${"e_account$i"},$e_date,${"e_account$i"."_amount"},$seq,$periode)) == false ) {
-      $Rollback($p_cn);exit("error __FILE__ __LINE__");}
+      $Rollback($p_cn);exit("error 'user_form_ods.php' __LINE__");}
   }
 
   if ( InsertJrn($p_cn,$e_date,"",$p_jrn,$e_comm,$sum_deb,$seq,$periode) == false ) {
-    $Rollback($p_cn);exit("error __FILE__ __LINE__");}
+    $Rollback($p_cn);exit("error 'user_form_ods.php' __LINE__");}
 
   // Set Internal code and Comment
   $internal_code=SetInternalCode($p_cn,$seq,$p_jrn);
diff --git a/include/user_update.php b/include/user_update.php
index 8dab468eb..36d1c5871 100644
--- a/include/user_update.php
+++ b/include/user_update.php
@@ -27,7 +27,7 @@ if ( $action == 'update' ) {
     }
     // p_id is jrn.jr_id
     $p_id=$_GET["line"];
-    echo_debug(__FILE__,__LINE__," action = update p_id = $p_id");
+    echo_debug('user_update.php',__LINE__," action = update p_id = $p_id");
     echo JS_VIEW_JRN_DETAIL;
     echo JS_CONCERNED_OP;
     $r ='<FORM METHOD="POST" ACTION="user_jrn.php">';