diff --git a/html/ecrit_ouv.php b/html/ecrit_ouv.php
index 09d90ef77..5bb01169b 100644
--- a/html/ecrit_ouv.php
+++ b/html/ecrit_ouv.php
@@ -73,7 +73,7 @@ if ( isset ($_GET['export'])) {
   $w->value=$periode;
   $w->name="p_periode";
   echo 'Période : '.$w->IOValue();
-  echo $w->Submit('export','Export');
+  echo widget::submit('export','Export');
   echo dossier::hidden();
   echo "</form>";
   exit(0);
@@ -102,7 +102,7 @@ if ( isset ($_GET['import'])) {
   $w->name='import_file';
   $w->label='p_file';
   echo $w->IOValue();
-  echo $w->Submit('p_submit','Charger le fichier');
+  echo widget::submit('p_submit','Charger le fichier');
 ?>
 </FORM>
 <?php
diff --git a/html/fiche.php b/html/fiche.php
index 104828342..4afcdfbfc 100644
--- a/html/fiche.php
+++ b/html/fiche.php
@@ -246,7 +246,7 @@ if ( isset ( $_GET["action"]) ) {
 	  $h=new widget('hidden');
 	  echo $h->IOValue('action','search');
 	  echo "Recherche :".$w->IOValue('search_text',$search_text);
-	  echo $w->Submit('submit','Rechercher');
+	  echo widget::submit('submit','Rechercher');
 	  echo '</form>';
 	  echo "Aucun résultat trouvé";
 
@@ -343,7 +343,7 @@ if ( ! isset($_REQUEST['action']) ){
   $h=new widget('hidden');
   echo $h->IOValue('action','search');
   echo "Recherche :".$w->IOValue('search_text',$search_text);
-  echo $w->Submit('submit','Rechercher');
+  echo widget::submit('submit','Rechercher');
   echo '</form>';
   echo '</div>';
 }
diff --git a/html/parametre.php b/html/parametre.php
index 11c54cdb2..5a04fca78 100644
--- a/html/parametre.php
+++ b/html/parametre.php
@@ -226,7 +226,7 @@ if ( $p_action=='company') {
   echo "<tr>".$compta->IOValue("p_compta",$array,"Utilisation de la compta. analytique")."</tr>";
   echo "</table>";
   $submit=new widget("submit");
-  echo $submit->Submit("record_company","Enregistre");
+  echo widget::submit("record_company","Enregistre");
   echo "</form>";
  }
 //-----------------------------------------------------
diff --git a/html/search_ca.php b/html/search_ca.php
index 9a506d5d6..0d671bad4 100644
--- a/html/search_ca.php
+++ b/html/search_ca.php
@@ -52,7 +52,7 @@ $hid=new widget("hidden");
 echo $hid->IOValue("c1",$_REQUEST['c1']);
 echo $hid->IOValue("c2",$_REQUEST['c2']);
 echo $hid->IOValue("go");
-echo $hid->Submit("go","Recherche");
+echo widget::submit("go","Recherche");
 echo '</form>';
 //------------- FORM ----------------------------------
 if ( isset($_REQUEST['go'])) {
diff --git a/html/user_advanced.php b/html/user_advanced.php
index eaab6978e..9aa9ea411 100644
--- a/html/user_advanced.php
+++ b/html/user_advanced.php
@@ -108,7 +108,7 @@ if ($p_action=="preod") {
   echo $hid->IOValue("sa","jrn");
   echo $hid->IOValue("p_action","preod");
   echo '<hr>';
-  echo widget::submit_button('Accepter','Accepter');
+  echo widget::submit('Accepter','Accepter');
   echo '</form>';
 
   // if $_REQUEST[sa] == del delete the predefined operation
diff --git a/include/action.inc.php b/include/action.inc.php
index e8c1f3ec5..5c40b3f70 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -254,13 +254,13 @@ if ( $sub_action=='detail' )
   $upload->name="file_upload";
   $upload->value="";
   echo "Enregistrer le fichier ".$upload->IOValue();
-  echo $upload->Submit("save","Sauve");
-  echo $upload->Submit("add_action_here","Ajoute une action à celle-ci");
+  echo widget::submit("save","Sauve");
+  echo widget::submit("add_action_here","Ajoute une action à celle-ci");
   echo '</form>';
   echo '<form action="commercial.php"  method="post"   >';
   echo dossier::hidden();
 
-  echo $upload->Submit("delete","Efface cette action");
+  echo widget::submit("delete","Efface cette action");
   echo '<input type="hidden" name="p_action" value="suivi_courrier">';
   echo '<input type="hidden" name="sa" value="delete">';
   echo '<input type="hidden" name="ag_id" value="'.$act->ag_id.'">';
@@ -294,7 +294,7 @@ if ( $sub_action == 'delete' )
       echo '<input type="hidden" name="sa" value="delete">';
       echo '<input type="hidden" name="ag_id" value="'.$act->ag_id.'">';
       $upload=new widget("text");
-      echo $upload->Submit("confirm_delete","Confirmer l'effacement");
+      echo widget::submit("confirm_delete","Confirmer l'effacement");
       
       echo '</form>';
       
diff --git a/include/balance.inc.php b/include/balance.inc.php
index 20d0865d3..3e26c7a87 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -47,7 +47,7 @@ if ( isset ($_POST['view']  ) ) {
   echo '<TR>';
   echo '<TD><form method="POST" ACTION="print_balance.php">'.
 	dossier::hidden().
-    $submit->Submit('bt_pdf',"Export PDF").
+    widget::submit('bt_pdf',"Export PDF").
     $hid->IOValue("p_action","impress").
     $hid->IOValue("from_periode",$_POST['from_periode']).
     $hid->IOValue("to_periode",$_POST['to_periode']).
@@ -56,7 +56,7 @@ if ( isset ($_POST['view']  ) ) {
     $hid->IOValue("to_poste",$_POST['to_poste']);
   echo "</form></TD>";
   echo '<TD><form method="POST" ACTION="bal_csv.php">'.
-    $submit->Submit('bt_csv',"Export CSV").
+    widget::submit('bt_csv',"Export CSV").
 	dossier::hidden().
     $hid->IOValue("p_action","impress").
     $hid->IOValue("from_periode",$_POST['from_periode']).
diff --git a/include/bank.inc.php b/include/bank.inc.php
index 6f2915554..00a5ef160 100644
--- a/include/bank.inc.php
+++ b/include/bank.inc.php
@@ -167,7 +167,7 @@ if ( $sub_action == "list")
   $sp= new widget("span");
   echo $sp->IOValue("qcode_label",$qcode)."</TD></TR>";
   echo $w->IOValue();
-  echo $w->Submit('gl_submit','Rechercher');
+  echo widget::submit('gl_submit','Rechercher');
   echo '</form>';
   echo $retour;
   // Show list of sell
@@ -355,7 +355,7 @@ if ( $p_jrn != -1 )
   echo $hid->IOValue("jrn_type","FIN");
   
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
   
   echo '</form>';
diff --git a/include/bud_card.inc.php b/include/bud_card.inc.php
index a5481cb4c..113b3ca42 100644
--- a/include/bud_card.inc.php
+++ b/include/bud_card.inc.php
@@ -33,7 +33,7 @@ $wHypo->value=make_array($cn,"select bh_id,bh_name from bud_hypothese");
 $wHypo->selected=(isset($_REQUEST['bh_id']))?$_REQUEST['bh_id']:"";
 $wHypo->javascript='onChange="this.form.submit();"';
 echo "Hypoth&egrave;se ".$wHypo->IOValue();
-echo widget::submit_button('recherche','recherche');
+echo widget::submit('recherche','recherche');
 echo dossier::hidden();
 echo widget::hidden("p_action","fiche");
 echo '</form>';
@@ -96,7 +96,7 @@ if ( $sa == "add" ) {
   $obj->bh_id=$_REQUEST['bh_id'];
   echo '<form method="post">';
   echo $obj->form();
-  echo widget::submit_button('add','Ajout');
+  echo widget::submit('add','Ajout');
   echo widget::hidden("p_action","fiche");
   echo dossier::hidden();
   echo '</form>';
@@ -115,8 +115,8 @@ if ( $sa == "detail" ) {
   echo dossier::hidden();
 
   echo $obj->form();
-  echo widget::submit_button('remove','Effacer','onClick="return confirm(\'Vous confirmez cet effacement ?\')"');
-  echo widget::submit_button('update','Mise &agrave jour');
+  echo widget::submit('remove','Effacer','onClick="return confirm(\'Vous confirmez cet effacement ?\')"');
+  echo widget::submit('update','Mise &agrave jour');
 
   echo '</div>';
  }
diff --git a/include/bud_detail.inc.php b/include/bud_detail.inc.php
index 17425f877..14015d621 100644
--- a/include/bud_detail.inc.php
+++ b/include/bud_detail.inc.php
@@ -41,7 +41,7 @@ if ( ! isset ($_REQUEST['bh_id'])) {
   echo '<form method="get">';
   echo dossier::hidden();
   echo  "Hypoth&egrave;se ".$wHypo->IOValue();
-  echo widget::submit_button('recherche','recherche');
+  echo widget::submit('recherche','recherche');
   echo widget::hidden('p_action','detail');
 
   echo '</form>';
@@ -82,7 +82,7 @@ if ( ! empty ($wPost_Analytic->value) && $po_id==-2  ) {
   echo widget::hidden('p_action','detail');
   echo dossier::hidden();
   echo "Poste Analytique ".$wPost_Analytic->IOValue();
-  echo widget::submit_button('recherche','recherche');
+  echo widget::submit('recherche','recherche');
   echo '</form>';
   echo $button_other;
 
diff --git a/include/bud_hypo.inc.php b/include/bud_hypo.inc.php
index d4c8905d9..46ad49fe4 100644
--- a/include/bud_hypo.inc.php
+++ b/include/bud_hypo.inc.php
@@ -78,7 +78,7 @@ if ( $sa == "add" ) {
   $obj=new Bud_Hypo($cn);
   echo '<form method="post">';
   echo $obj->form();
-  echo widget::submit_button('add','Ajout');
+  echo widget::submit('add','Ajout');
   echo '</form>';
   echo '</div>';
  }
@@ -93,8 +93,8 @@ if ( $sa == "detail" ) {
   echo '<div class="u_redcontent">';
   echo '<form method="post">';
   echo $obj->form(1);
-  echo widget::submit_button('remove','Effacer','onClick="return confirm(\'Vous confirmez cet effacement ?\')"');
-  echo widget::submit_button('update','Mise &agrave jour');
+  echo widget::submit('remove','Effacer','onClick="return confirm(\'Vous confirmez cet effacement ?\')"');
+  echo widget::submit('update','Mise &agrave jour');
 
   echo '</div>';
  }
diff --git a/include/bud_sacc.inc.php b/include/bud_sacc.inc.php
index 50cf6b992..2a3fe9d92 100644
--- a/include/bud_sacc.inc.php
+++ b/include/bud_sacc.inc.php
@@ -33,7 +33,7 @@ $obj->from_array($_GET);
 // if ( ! isset ($_GET['detail']) && ! isset ($_GET['display'])) {
   echo '<form METHOD="GET">';
   echo $obj->select_hypo();
-  echo widget::submit_button('detail','Accepter');
+  echo widget::submit('detail','Accepter');
   echo widget::hidden('do','acc');
  echo widget::hidden('p_action','synthese');
  echo '</form>';
@@ -45,7 +45,7 @@ if ( isset( $_GET['bh_id'])) {
 
   $obj->bh_id=$_GET['bh_id'];
   echo $obj->form();
-  echo widget::submit_button('display','Afficher');
+  echo widget::submit('display','Afficher');
   echo widget::hidden('do','acc');
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
@@ -64,7 +64,7 @@ if ( isset($_GET['display'])) {
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
   echo dossier::hidden();
-  echo widget::submit_button('display','Export CSV');
+  echo widget::submit('display','Export CSV');
   echo '</form>';
  }
 
diff --git a/include/bud_sga.inc.php b/include/bud_sga.inc.php
index 90a7e6335..5b0312aa9 100644
--- a/include/bud_sga.inc.php
+++ b/include/bud_sga.inc.php
@@ -35,7 +35,7 @@ $bh_id=(isset($_REQUEST['bh_id']))?$_REQUEST['bh_id']:'';
 echo '<form METHOD="GET">';
 $obj->from_array($_GET);
 echo $obj->form();
-echo widget::submit_button('display','Afficher');
+echo widget::submit('display','Afficher');
 echo widget::hidden('do','ga');
 echo widget::hidden('p_action','synthese');
 echo '</form>';
@@ -50,7 +50,7 @@ if ( isset($_GET['display'])) {
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
   echo dossier::hidden();
-  echo widget::submit_button('display','Export CSV');
+  echo widget::submit('display','Export CSV');
   echo '</form>';
  }
 
diff --git a/include/bud_spo.inc.php b/include/bud_spo.inc.php
index ba0020229..8427ecf10 100644
--- a/include/bud_spo.inc.php
+++ b/include/bud_spo.inc.php
@@ -32,7 +32,7 @@ $bh_id=(isset($_REQUEST['bh_id']))?$_REQUEST['bh_id']:'';
 // if ( ! isset ($_GET['detail']) && ! isset ($_GET['display'])) {
   echo '<form METHOD="GET">';
   echo $obj->select_hypo();
-  echo widget::submit_button('detail','Accepter');
+  echo widget::submit('detail','Accepter');
   echo widget::hidden('do','po');
  echo widget::hidden('p_action','synthese');
  echo '</form>';
@@ -45,7 +45,7 @@ if ( isset( $_GET['bh_id'])) {
 
   $obj->bh_id=$_GET['bh_id'];
   echo $obj->form();
-  echo widget::submit_button('display','Afficher');
+  echo widget::submit('display','Afficher');
   echo widget::hidden('do','po');
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
@@ -64,7 +64,7 @@ if ( isset($_GET['display'])) {
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
   echo dossier::hidden();
-  echo widget::submit_button('display','Export CSV');
+  echo widget::submit('display','Export CSV');
   echo '</form>';
  }
 
diff --git a/include/bud_svglobal.inc.php b/include/bud_svglobal.inc.php
index b932d03fa..68b3f217e 100644
--- a/include/bud_svglobal.inc.php
+++ b/include/bud_svglobal.inc.php
@@ -33,7 +33,7 @@ $obj->from_array($_GET);
 // if ( ! isset ($_GET['detail']) && ! isset ($_GET['display'])) {
   echo '<form METHOD="GET">';
   echo $obj->select_hypo();
-  echo widget::submit_button('detail','Accepter');
+  echo widget::submit('detail','Accepter');
   echo widget::hidden('do','vglobal');
  echo widget::hidden('p_action','synthese');
  echo '</form>';
@@ -45,7 +45,7 @@ if ( isset( $_GET['bh_id'])) {
 
   $obj->bh_id=$_GET['bh_id'];
   echo $obj->form();
-  echo widget::submit_button('display','Afficher');
+  echo widget::submit('display','Afficher');
   echo widget::hidden('do','vglobal');
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
@@ -64,7 +64,7 @@ if ( isset($_GET['display'])) {
   echo widget::hidden('p_action','synthese');
   echo widget::hidden('bh_id',$obj->bh_id);
   echo dossier::hidden();
-  echo widget::submit_button('display','Export CSV');
+  echo widget::submit('display','Export CSV');
   echo '</form>';
  }
 
diff --git a/include/ca_group.inc.php b/include/ca_group.inc.php
index 1241566af..de973997f 100644
--- a/include/ca_group.inc.php
+++ b/include/ca_group.inc.php
@@ -73,12 +73,12 @@ $wPa_id->value=$val_pa_id;
 echo "<td>".$w->IOValue("ga_id")."</td>";
 echo "<td>".$wPa_id->IOValue("pa_id")."</td>";
 echo "<td>".$w->IOValue("ga_description").
-widget::submit_button('add','Ajouter').
+widget::submit('add','Ajouter').
 "</td>";;
 
 echo '</table>';
 
 echo "<hr>";
-echo widget::submit_button('remove','Effacer');
+echo widget::submit('remove','Effacer');
 
 echo '</div>';
diff --git a/include/ca_od.inc.php b/include/ca_od.inc.php
index f8b399520..c82168734 100644
--- a/include/ca_od.inc.php
+++ b/include/ca_od.inc.php
@@ -95,7 +95,7 @@ echo '
  $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
  $w->selected=$current;
  
- echo 'P&eacute;riode  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider').'</form>';
+ echo 'P&eacute;riode  '.widget::submit('gl_submit','Valider').'</form>';
 
   echo '<div class="u_redcontent">';
   echo $a->html_table($current);
@@ -130,7 +130,7 @@ if ( isset($_GET['new'])) {
   echo dossier::hidden();
   echo $wSubmit->IOValue();
   echo $a->form();
-  echo $wSubmit->Submit("save","Sauver");
+  echo widget::submit("save","Sauver");
   echo '</form>';
   echo '<div class="info">
     D&eacute;bit = <span id="totalDeb"></span>
diff --git a/include/ca_pa.inc.php b/include/ca_pa.inc.php
index c97a2fb3a..227dd64b2 100644
--- a/include/ca_pa.inc.php
+++ b/include/ca_pa.inc.php
@@ -54,7 +54,7 @@ if ( isset($_REQUEST['sa']))
 			$wSa->value="pa_write";
 			$ret.= $wSa->IOValue();
 			$ret.= $wAction->IOValue();
-			$ret.= $wSa->Submit("submit","Enregistre");
+			$ret.=widget::submit("submit","Enregistre");
 			$ret.= '</form>';
 			$ret.= '</div>';
 		  }
@@ -103,7 +103,7 @@ if ( isset($_REQUEST['sa']))
 		$ret.= $new->form();
 		$ret.= $wSa->IOValue();
 		$ret.= $wAction->IOValue();
-		$ret.= $wSa->Submit("submit","Enregistre");
+		$ret.=widget::submit("submit","Enregistre");
 		$ret.=sprintf('<A class="mtitle" HREF="%s">'.
 					  '<input type="button" value="Efface"></A>',
 					  "?p_action=ca_pa&pa_id=".$_GET['pa_id']."&sa=pa_delete&$str_dossier");
@@ -134,7 +134,7 @@ if ( isset($_REQUEST['sa']))
 		$ret.=dossier::hidden();
 		$ret.=$po->form();
 		$ret.=$wSa->IOValue();
-		$ret.=$wSa->Submit("add","Ajout");
+		$ret.=widget::submit("add","Ajout");
 		$ret.="</div>";
 	  }
 	// record the poste
diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php
index a612d5cd6..6df553909 100644
--- a/include/class_acc_account_ledger.php
+++ b/include/class_acc_account_ledger.php
@@ -277,12 +277,12 @@ function get_solde_detail($p_cond="") {
      
      echo '<TD><form method="GET" ACTION="">'.
 	   dossier::hidden().
-       $submit->Submit('bt_other',"Autre poste").
+       widget::submit('bt_other',"Autre poste").
        $hid->IOValue("type","poste").$hid->IOValue('p_action','impress')."</form></TD>";
      
      echo '<TD><form method="POST" ACTION="poste_pdf.php">'.
 	   dossier::hidden().
-       $submit->Submit('bt_pdf',"Export PDF").
+       widget::submit('bt_pdf',"Export PDF").
        $hid->IOValue("type","poste").
        $hid->IOValue('p_action','impress').
        $hid->IOValue("poste_id",$_POST['poste_id']).
@@ -294,7 +294,7 @@ function get_solde_detail($p_cond="") {
      
      echo '<TD><form method="POST" ACTION="poste_csv.php">'.
 	   dossier::hidden().
-       $submit->Submit('bt_csv',"Export CSV").
+       widget::submit('bt_csv',"Export CSV").
        $hid->IOValue("type","poste").
        $hid->IOValue('p_action','impress').
        $hid->IOValue("poste_id",$_POST['poste_id']).
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index d121a20c9..798b8caed 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -1236,13 +1236,13 @@ class Acc_Ledger {
     // Vide
     echo '<FORM method="post">';
     echo $a->select_ledger()->IOValue();
-    echo widget::submit_button('go','Test it');
+    echo widget::submit('go','Test it');
     echo '</form>';
     if ( isset($_POST['go'])) {
       echo "Ok ";
       echo '<form method="post">';
       echo $a->show_form();
-      echo widget::submit_button('post_id','Try me');
+      echo widget::submit('post_id','Try me');
       echo '</form>';
       // Show the predef operation
       // Don't forget the p_jrn 
@@ -1253,7 +1253,7 @@ class Acc_Ledger {
       $op->p_jrn=$id;
       $op->od_direct='t';
       if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
       echo $op->show_button();
       echo '</form>';
       exit();
@@ -1262,7 +1262,7 @@ class Acc_Ledger {
     if ( isset($_POST['post_id' ])) {
       echo '<form method="post">';
       echo $a->show_form($_POST,1);
-      echo widget::submit_button('save_it',"Sauver");
+      echo widget::submit('save_it',"Sauver");
       echo '</form>';
       exit();
     }
@@ -1277,7 +1277,7 @@ class Acc_Ledger {
 	echo '<form method="post">';
 
 	echo $a->show_form($_POST);
-	echo widget::submit_button('post_id','Try me');
+	echo widget::submit('post_id','Try me');
 	echo '</form>';
 	 
       }
@@ -1295,7 +1295,7 @@ class Acc_Ledger {
       echo '<FORM method="post">';
 
       echo $a->show_form($p_post);
-      echo widget::submit_button('post_id','Use predefined operation');
+      echo widget::submit('post_id','Use predefined operation');
       echo '</form>';
       exit();
 
diff --git a/include/class_action.php b/include/class_action.php
index 3235e6427..4abc87fd3 100644
--- a/include/class_action.php
+++ b/include/class_action.php
@@ -502,8 +502,8 @@ class action
 
 
       if ( $this->f_id_dest != -1 && $this->f_id_exp !=-1 )
-	$r.=$desc->Submit("Save","Sauve");
-      $r.=$desc->Submit("corr","Corrige");
+	$r.=widget::submit("Save","Sauve");
+      $r.=widget::submit("corr","Corrige");
 
       $r.=$h_url."</form>";
       return $r;
@@ -610,7 +610,7 @@ class action
       $upload->name="file_upload";
       $upload->value="";
       $r.="Enregistrer le fichier ".$upload->IOValue();
-      $r.=$upload->Submit("save","Sauve le fichier");
+      $r.=widget::submit("save","Sauve le fichier");
       $r.="</form>";
       return $r;
     }
diff --git a/include/class_anc_balance_double.php b/include/class_anc_balance_double.php
index 13b59dae9..df0e042af 100644
--- a/include/class_anc_balance_double.php
+++ b/include/class_anc_balance_double.php
@@ -312,7 +312,7 @@ class Anc_Balance_Double extends Anc_Print
 	$r.= $hidden->IOValue("pa_id2",$this->pa_id2);
 	$r.= $hidden->IOValue("from_poste2",$this->from_poste2);
 	$r.= $hidden->IOValue("to_poste2",$this->to_poste2);
-	$r.= $submit->Submit('bt_pdf',"Export en PDF");
+	$r.=widget::submit('bt_pdf',"Export en PDF");
 	$r.= '</form>';
 
 	$r.= '<form method="GET" action="'.$url_csv.'"  style="display:inline">';
@@ -326,7 +326,7 @@ class Anc_Balance_Double extends Anc_Print
 	$r.= $hidden->IOValue("to_poste2",$this->to_poste2);
 	$r.= $p_string;
 	$r.= dossier::hidden();
-	$r.= $submit->Submit('bt_csv',"Export en CSV");
+	$r.=widget::submit('bt_csv',"Export en CSV");
 	$r.= '</form>';
 	return $r;
 
diff --git a/include/class_anc_balance_simple.php b/include/class_anc_balance_simple.php
index 3a30e321c..11c9f105b 100644
--- a/include/class_anc_balance_simple.php
+++ b/include/class_anc_balance_simple.php
@@ -258,7 +258,7 @@ class Anc_Balance_Simple extends Anc_Print {
 	$r.= $hidden->IOValue("pa_id",$this->pa_id);
 	$r.= $hidden->IOValue("from_poste",$this->from_poste);
 	$r.= $hidden->IOValue("to_poste",$this->to_poste);
-	$r.= $submit->Submit('bt_pdf',"Export en PDF");
+	$r.=widget::submit('bt_pdf',"Export en PDF");
 	$r.= '</form>';
 
 	$r.= '<form method="GET" action="'.$url_csv.'"  style="display:inline">';
@@ -270,7 +270,7 @@ class Anc_Balance_Simple extends Anc_Print {
 
 	$r.= $p_string;
 	$r.= dossier::hidden();
-	$r.= $submit->Submit('bt_csv',"Export en CSV");
+	$r.=widget::submit('bt_csv',"Export en CSV");
 	$r.= '</form>';
 	return $r;
 }
diff --git a/include/class_anc_listing.php b/include/class_anc_listing.php
index 69d55219e..a7befe63e 100644
--- a/include/class_anc_listing.php
+++ b/include/class_anc_listing.php
@@ -152,7 +152,7 @@ class Anc_Listing extends Anc_Print {
 	$r.= $hidden->IOValue("pa_id",$this->pa_id);
 	$r.= $hidden->IOValue("from_poste",$this->from_poste);
 	$r.= $hidden->IOValue("to_poste",$this->to_poste);
-	$r.= $submit->Submit('bt_pdf',"Export en PDF");
+	$r.=widget::submit('bt_pdf',"Export en PDF");
 	$r.= '</form>';
 	*/
 
@@ -165,7 +165,7 @@ class Anc_Listing extends Anc_Print {
 
 	$r.= $p_string;
 	$r.= dossier::hidden();
-	$r.= $submit->Submit('bt_csv',"Export en CSV");
+	$r.=widget::submit('bt_csv',"Export en CSV");
 	$r.= '</form>';
 	return $r;
 
diff --git a/include/class_bud_data.php b/include/class_bud_data.php
index df1b8a72b..9d728abf6 100644
--- a/include/class_bud_data.php
+++ b/include/class_bud_data.php
@@ -400,7 +400,7 @@ class Bud_Data {
     echo dossier::hidden();
     $w->selected=(isset($_REQUEST['bh_po_id']))?$_REQUEST['bh_po_id']:"";
     echo $w->IOValue('bh_po_id',make_array($cn,$sql));
-    echo widget::submit_button('search','Recherche');
+    echo widget::submit('search','Recherche');
 
     echo '</form>';
     if ( isset($_REQUEST['search'])) {
diff --git a/include/class_bud_synthese_acc.php b/include/class_bud_synthese_acc.php
index 72537904c..a633ede01 100644
--- a/include/class_bud_synthese_acc.php
+++ b/include/class_bud_synthese_acc.php
@@ -277,14 +277,14 @@ class Bud_Synthese_Acc extends Bud_Synthese {
     $obj=new Bud_Synthese_Acc($cn);
     echo '<form method="GET">';
     echo $obj->select_hypo();
-    echo widget::submit_button('recherche','recherche');
+    echo widget::submit('recherche','recherche');
     echo '</form>';
     if ( isset($_GET['recherche'])) {
       $obj->from_array($_GET);
       echo '<form method="GET">';
       echo $obj->form();
       echo widget::hidden('bh_id',$obj->bh_id);
-      echo widget::submit_button('recherche2','recherche');
+      echo widget::submit('recherche2','recherche');
       echo '</form>';
     }
     if ( isset($_GET['recherche2'])){
diff --git a/include/class_bud_synthese_anc.php b/include/class_bud_synthese_anc.php
index c76ed4b0a..9d57e18a9 100644
--- a/include/class_bud_synthese_anc.php
+++ b/include/class_bud_synthese_anc.php
@@ -271,14 +271,14 @@ class Bud_Synthese_Anc extends Bud_Synthese {
     $obj=new Bud_Synthese_Anc($cn);
     echo '<form method="GET">';
     echo $obj->select_hypo();
-    echo widget::submit_button('recherche','recherche');
+    echo widget::submit('recherche','recherche');
     echo '</form>';
     if ( isset($_GET['recherche'])) {
       $obj->from_array($_GET);
       echo '<form method="GET">';
       echo $obj->form();
       echo widget::hidden('bh_id',$obj->bh_id);
-      echo widget::submit_button('recherche2','recherche');
+      echo widget::submit('recherche2','recherche');
       echo '</form>';
     }
     if ( isset($_GET['recherche2'])){
diff --git a/include/class_bud_synthese_group.php b/include/class_bud_synthese_group.php
index c80d12859..7d57cd4f3 100644
--- a/include/class_bud_synthese_group.php
+++ b/include/class_bud_synthese_group.php
@@ -514,14 +514,14 @@ Array
     $obj=new Bud_Synthese_Group($cn);
     echo '<form method="GET">';
     echo $obj->select_hypo();
-    echo widget::submit_button('recherche','recherche');
+    echo widget::submit('recherche','recherche');
     echo '</form>';
     if ( isset($_GET['recherche'])) {
       $obj->from_array($_GET);
       echo '<form method="GET">';
       echo $obj->form();
       echo widget::hidden('bh_id',$obj->bh_id);
-      echo widget::submit_button('recherche2','recherche');
+      echo widget::submit('recherche2','recherche');
       echo '</form>';
     }
     if ( isset($_GET['recherche2'])){
diff --git a/include/class_bud_synthese_hypo.php b/include/class_bud_synthese_hypo.php
index 9d4f86557..596a08128 100644
--- a/include/class_bud_synthese_hypo.php
+++ b/include/class_bud_synthese_hypo.php
@@ -335,7 +335,7 @@ Array
     $obj=new Bud_Synthese_Hypo($cn);
     echo '<form method="GET">';
     echo $obj->form();
-    echo widget::submit_button('recherche','Recherche');
+    echo widget::submit('recherche','Recherche');
     echo '</form>';
     print_r($_GET);
     if ( isset ($_GET['recherche'])) {
diff --git a/include/class_document_modele.php b/include/class_document_modele.php
index 8b6107dc0..d85e2f22e 100644
--- a/include/class_document_modele.php
+++ b/include/class_document_modele.php
@@ -82,7 +82,7 @@ class Document_modele {
     $a->name="sa";
     $a->value="rm_template";
     $r.=$a->IOValue();
-    $r.=$a->Submit("rm_template","Effacer la sélection");
+    $r.=widget::submit("rm_template","Effacer la sélection");
     $r.="</form></p>";
     return $r;
   }
@@ -287,7 +287,7 @@ class Document_modele {
       $start->size=9;
       $start->value="0";
       $r.=" Numerotation commence a ".$start->IOValue()."";
-      $r.=$w->Submit('add_document','Ajout');
+      $r.=widget::submit('add_document','Ajout');
       $r.="</form></p>";
       return $r;
     }
diff --git a/include/class_fiche.php b/include/class_fiche.php
index 8b6b31a13..4cf45c5c6 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -900,12 +900,12 @@ class fiche {
      echo '<TR>';
      
      echo '<TD><form method="GET" ACTION="">'.
-       $submit->Submit('bt_other',"Autre poste").
+       widget::submit('bt_other',"Autre poste").
 	dossier::hidden().
        $hid->IOValue("type","poste").$hid->IOValue('p_action','impress')."</form></TD>";
      
      echo '<TD><form method="POST" ACTION="quick_code_pdf.php">'.
-       $submit->Submit('bt_pdf',"Export PDF").
+       widget::submit('bt_pdf',"Export PDF").
 	dossier::hidden().
        $hid->IOValue("type","poste").
        $hid->IOValue('p_action','impress').
@@ -916,7 +916,7 @@ class fiche {
      echo "</form></TD>";
      
      echo '<TD><form method="POST" ACTION="quick_code_csv.php">'.
-       $submit->Submit('bt_csv',"Export CSV").
+       widget::submit('bt_csv',"Export CSV").
 	dossier::hidden().
        $hid->IOValue("type","poste").
        $hid->IOValue('p_action','impress').
diff --git a/include/class_widget.php b/include/class_widget.php
index 21aa18521..772bc0103 100644
--- a/include/class_widget.php
+++ b/include/class_widget.php
@@ -645,10 +645,7 @@ class widget {
     $readonly=($this->readonly==false)?"false":"true";
     echo "read only".$readonly."<br>";
   }
-  function Submit ($p_name,$p_value) {
-    return '<INPUT TYPE="SUBMIT" NAME="'.$p_name.'" VALUE="'.$p_value.'">';
-  }
-  static   function submit_button ($p_name,$p_value,$p_javascript="") {
+  static   function submit ($p_name,$p_value,$p_javascript="") {
     
     return '<INPUT TYPE="SUBMIT" NAME="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>';
   }
diff --git a/include/client.inc.php b/include/client.inc.php
index c52424dec..ce2324cba 100644
--- a/include/client.inc.php
+++ b/include/client.inc.php
@@ -163,9 +163,9 @@ if ( $sub_action == 'detail' )
   echo $w->IOValue();
 
   
-  echo $w->Submit('mod','Sauver les modifications');
-  echo $w->Reset("Annuler");
-  echo $w->Submit('delete','Effacer cette fiche');
+  echo widget::submit('mod','Sauver les modifications');
+  echo widget::reset("Annuler");
+  echo widget::submit('delete','Effacer cette fiche');
   
   echo '</form>';
   echo $retour;
diff --git a/include/constant.php b/include/constant.php
index 602c1a1b1..359b26101 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -32,11 +32,11 @@ define ("phpcompta_psql_port","5432");
 define ("phpcompta_user","phpcompta");
 //
 // the domain can't start by a number !!!
-define ("domaine","beta_");
+define ("domaine","selfreliance");
 define ("MAX_COMPTE",4);
 define ('MAX_BUD_DETAIL',20);
 
-define ("DEBUG","false");
+define ("DEBUG","true");
 
 // securite correspond a la table 
 // action
diff --git a/include/contact.inc.php b/include/contact.inc.php
index 2a530a596..e16eb3bf6 100644
--- a/include/contact.inc.php
+++ b/include/contact.inc.php
@@ -208,9 +208,9 @@ if ( $sub_action == 'detail' )
   $w->value=$f_id;
   echo $w->IOValue();
 
-  echo $w->Submit('mod','Sauver les modifications');
+  echo widget::submit('mod','Sauver les modifications');
   echo '<A HREF="commercial.php?p_action=contact&'.$str_dossier.'"><INPUT TYPE="button" value="Retour"></A>';
-  echo $w->Submit('delete','Effacer cette fiche');
+  echo widget::submit('delete','Effacer cette fiche');
   echo '</form>';
   echo $retour;
   echo '<div>';
diff --git a/include/depense.inc.php b/include/depense.inc.php
index 1519fab8d..33b2ae8eb 100644
--- a/include/depense.inc.php
+++ b/include/depense.inc.php
@@ -96,7 +96,7 @@ echo '</div>';
   echo $hid->IOValue("sa","use_opd");
   
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
 
   echo '</form>';
@@ -182,7 +182,7 @@ if ( $sub_action == "list")
   echo $w->IOValue();
   echo $sp->IOValue("qcode_label","QuickCode",$qcode);
 
-  echo $w->Submit('gl_submit','Rechercher');
+  echo widget::submit('gl_submit','Rechercher');
 
   echo '<br>'.$retour;
 
@@ -223,7 +223,7 @@ if ( $sub_action == "list")
   echo $list;
   echo "$bar <hr>";
   if ( $max_line !=0 )
-    echo $hid->Submit('paid','Mise à jour paiement');
+    echo widget::submit('paid','Mise à jour paiement');
   echo '</FORM>';
   echo $retour;
 
@@ -302,7 +302,7 @@ echo '</div>';
     $hid=new widget();
     echo '<hr>';
    if ( $m != 0 )
-     echo $hid->Submit('paid','Mise à jour paiement');
+     echo widget::submit('paid','Mise à jour paiement');
     echo '</form>';
 
     echo '</div>';
@@ -446,7 +446,7 @@ if ( $p_jrn != -1 )
   echo $hid->IOValue("sa","use_opd");
   
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
 
   echo '</form>';
diff --git a/include/facture.inc.php b/include/facture.inc.php
index 9bf8d77c3..28c0b0b0f 100644
--- a/include/facture.inc.php
+++ b/include/facture.inc.php
@@ -143,7 +143,7 @@ if ( $sub_action == "list")
 
   echo $sp->IOValue("qcode_label","",$qcode);
   echo $w->IOValue();
-echo $w->Submit('gl_submit','Rechercher');
+echo widget::submit('gl_submit','Rechercher');
   // Show list of sell
   // Date - date of payment - Customer - amount
  if ( $current == -1) {
@@ -176,7 +176,7 @@ echo $w->Submit('gl_submit','Rechercher');
   echo $list;
   echo "$bar <hr>";
   if ( $max_line !=0 )
-    echo $hid->Submit('paid','Mise à jour paiement');
+    echo widget::submit('paid','Mise à jour paiement');
   echo '</FORM>';
   echo $retour;
 
@@ -257,7 +257,7 @@ echo '</div>';
     echo '<hr>';
 
     if ( $m != 0 )
-      echo $hid->Submit('paid','Mise à jour paiement');
+      echo widget::submit('paid','Mise à jour paiement');
 
     echo '</FORM>';
     echo '</div>';
@@ -293,7 +293,7 @@ if ( $sub_action=="use_opd" ) {
   echo $hid->IOValue("sa","use_opd");
   
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
 
   echo '</form>';
@@ -431,7 +431,7 @@ if ( $p_jrn != -1 )
   echo $hid->IOValue("sa","use_opd");
   
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
 
   echo '</form>';
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 9a317c205..549a04268 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -62,7 +62,7 @@ function ShowRecherche() {
   echo $h->IOValue('p_action','fiche');
   echo $h->IOValue('action','search');
   echo "Recherche :".$w->IOValue('search_text',$search_text);
-  echo $w->Submit('submit','Rechercher');
+  echo widget::submit('submit','Rechercher');
   echo '</form>';
   echo '</div>';
 }
diff --git a/include/fiche_def.inc.php b/include/fiche_def.inc.php
index a2fd56b44..fed2f7318 100644
--- a/include/fiche_def.inc.php
+++ b/include/fiche_def.inc.php
@@ -45,7 +45,7 @@ for ($i=0;$i<sizeof($all);$i++)
   echo '<form method="post">';
   $w=new widget('hidden');
   echo $w->IOValue('idx',$i);
-  echo $w->Submit('mod','modifie');
+  echo widget::submit('mod','modifie');
   echo $w->IOValue('fiche','p_action');
   echo "</form>";
   echo "</TD>";
@@ -70,8 +70,8 @@ if ( isset ($_POST['mod']) )
   echo "</ul>";
   $w=new widget("hidden");
   echo $w->IOValue('p_action','fiche');
-  echo $w->Submit('confirm_mod' ,'Confirme');
-  echo $w->Submit('no','Cancel');
+  echo widget::submit('confirm_mod' ,'Confirme');
+  echo widget::submit('no','Cancel');
   echo '</form>';
   echo '</div>';
 }
diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php
index c787fd44b..adefc9c44 100644
--- a/include/impress_bilan.inc.php
+++ b/include/impress_bilan.inc.php
@@ -46,7 +46,7 @@ echo widget::hidden('p_action','impress');
 echo widget::hidden('type','bilan');
 echo dossier::hidden();
 echo $bilan->display_form ($filter_year);
-echo widget::submit_button('verif','Verification comptabilite');
+echo widget::submit('verif','Verification comptabilite');
 echo '</FORM>';
 
 
@@ -62,7 +62,7 @@ if ( isset($_GET['verif'])) {
 
   echo widget::hidden('from_periode',$bilan->from);
   echo widget::hidden('to_periode',$bilan->to);
-  echo widget::submit_button('Impression','Impression');
+  echo widget::submit('Impression','Impression');
   echo '</form>';
 
  }
diff --git a/include/impress_fiche.inc.php b/include/impress_fiche.inc.php
index 39bf1c0b8..27f9a1bb5 100644
--- a/include/impress_fiche.inc.php
+++ b/include/impress_fiche.inc.php
@@ -40,7 +40,7 @@ if  ( isset ($_REQUEST['fd_id'])) {
   $fiche_def=new fiche_def($cn);
 
   echo '<form method="POST" ACTION="fiche_csv.php">'.dossier::hidden().
-    $submit->Submit('bt_csv',"Export CSV").
+    widget::submit('bt_csv',"Export CSV").
     $hid->IOValue("type","fiche").
     $hid->IOValue("p_action","impress").
     $fiche_id->IOValue("fd_id",$_REQUEST['fd_id']);
@@ -50,7 +50,7 @@ if  ( isset ($_REQUEST['fd_id'])) {
     echo $hid->IOValue("to_periode",$_REQUEST['to_periode']);
   }
   echo "</form>";
-  echo '<form method="Post" action="?p_action=impress&type=fiche">'.$submit->Submit("bt_submit","Autres fiches").dossier::hidden()."</form>";
+  echo '<form method="Post" action="?p_action=impress&type=fiche">'.widget::submit("bt_submit","Autres fiches").dossier::hidden()."</form>";
   
   $fiche_def->id=$_REQUEST['fd_id'];
 
@@ -71,7 +71,7 @@ if  ( isset ($_REQUEST['fd_id'])) {
     print " Jusque ".$w->IOValue('to_periode',$periode_end);
     
 
-    print $submit->Submit('bt_solde',"Avec solde").
+    print widget::submit('bt_solde',"Avec solde").
     $hid->IOValue("type","fiche").
     $fiche_id->IOValue("fd_id",$_REQUEST['fd_id']).
       $hid->IOValue("with_amount");
diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php
index f1fa30191..a0ecfba31 100644
--- a/include/impress_jrn.inc.php
+++ b/include/impress_jrn.inc.php
@@ -60,11 +60,11 @@ require_once("class_acc_ledger.php");
   echo "<table>";
   echo '<TR>';
   echo '<TD><form method="GET" ACTION="?">'.dossier::hidden().
-    $submit->Submit('bt_other',"Autre journal").
+    widget::submit('bt_other',"Autre journal").
     $hid->IOValue("type","jrn").$hid->IOValue('p_action','impress')."</form></TD>";
 
   echo '<TD><form method="GET" ACTION="jrn_pdf.php">'.dossier::hidden().
-    $submit->Submit('bt_pdf',"Export PDF").
+    widget::submit('bt_pdf',"Export PDF").
     $hid->IOValue("type","jrn").
     $hid->IOValue("p_action","impress").
     $hid->IOValue("central",$p_cent).
@@ -75,7 +75,7 @@ require_once("class_acc_ledger.php");
 
   echo "</form></TD>";
   echo '<TD><form method="GET" ACTION="jrn_csv.php">'.dossier::hidden().
-    $submit->Submit('bt_csv',"Export CSV").
+    widget::submit('bt_csv',"Export CSV").
     $hid->IOValue("type","jrn").
     $hid->IOValue("p_action","impress").
     $hid->IOValue("central",$p_cent).
@@ -239,7 +239,7 @@ $w->selected=1;
 echo $w->IOValue('p_simple',$a,'Style d\'impression');
 print "</TR>";
 echo '</TABLE>';
-print $w->Submit('bt_html','Impression');
+print widget::submit('bt_html','Impression');
 
 echo '</FORM>';
   echo '<span class="notice"> Attention : en-cas d\'impression de journaux centralis&eacute;s, dans le PDF, les montants d&eacute;bit et cr&eacute;dit calcul&eacute;s  par page sont la somme des montants de la page uniquement. Si une op&eacute;ration est sur 2 pages ces montants diff&egrave;reront évidemment. Ces montants doivent &ecirc;tre &eacute;gaux sur la derni&egrave;re page. Pour v&eacute;rifier la balance, utilisez la balance des comptes ou Avanc&eacute;->V&eacute;rification</span>';
diff --git a/include/impress_listing_client.inc.php b/include/impress_listing_client.inc.php
index 49c5fb906..775066f10 100644
--- a/include/impress_listing_client.inc.php
+++ b/include/impress_listing_client.inc.php
@@ -84,7 +84,7 @@ $w->label="Ann
 print $w->IOValue('year',$year);
 print "</TR>";
 echo '</TABLE>';
-print $w->Submit('bt_html','Impression');
+print widget::submit('bt_html','Impression');
 
 echo '</FORM>';
 
diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php
index 99190871b..5e4a33aee 100644
--- a/include/impress_poste.inc.php
+++ b/include/impress_poste.inc.php
@@ -71,7 +71,7 @@ $all->label="Tous les postes qui en d
 $all->disabled=false;
 echo $all->IOValue("poste_fille");
 echo '</TABLE>';
-print $w->Submit('bt_html','Impression');
+print widget::submit('bt_html','Impression');
 
 echo '</FORM>';
 echo '</div>';
diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php
index 732c9f2b0..ff1cccd9d 100644
--- a/include/impress_rapport.inc.php
+++ b/include/impress_rapport.inc.php
@@ -78,11 +78,11 @@ if ( isset( $_GET['bt_html'] ) ) {
   echo '<TR>';
   echo '<TD><form method="GET" ACTION="?">'.
 	dossier::hidden().
-    $submit->Submit('bt_other',"Autre Rapport").
+    widget::submit('bt_other',"Autre Rapport").
     $hid->IOValue("type","rapport").$hid->IOValue("p_action","impress")."</form></TD>";
 
   echo '<TD><form method="GET" ACTION="form_pdf.php">'.
-    $submit->Submit('bt_pdf',"Export PDF").
+    widget::submit('bt_pdf',"Export PDF").
 	dossier::hidden().
     $hid->IOValue("type","rapport").
     $hid->IOValue("p_action","impress").
@@ -98,7 +98,7 @@ if ( isset( $_GET['bt_html'] ) ) {
 
   echo "</form></TD>";
   echo '<TD><form method="GET" ACTION="form_csv.php">'.
-    $submit->Submit('bt_csv',"Export CSV").
+    widget::submit('bt_csv',"Export CSV").
 	dossier::hidden().
     $hid->IOValue("type","form").
     $hid->IOValue("p_action","impress").
@@ -204,7 +204,7 @@ echo '<span class="notice"> Attention : vous ne pouvez pas utiliser les &eacute;
 echo '<br>';
 echo '<span class="notice"> Les clauses FROM sont ignorés avec les dates calendriers</span>';
 echo '<br>';
-print $w->Submit('bt_html','Impression');
+print widget::submit('bt_html','Impression');
 
 echo '</FORM>';
 echo '</div>';
diff --git a/include/periode.inc.php b/include/periode.inc.php
index f923bf781..5e4109fc3 100644
--- a/include/periode.inc.php
+++ b/include/periode.inc.php
@@ -123,7 +123,7 @@ if ( $choose=="yes" ) {
   $wSel->value=$sel_jrn;
   $wSel->name='jrn_def_id';
   echo "Choississez global ou uniquement le journal à fermer".$wSel->IOValue();
-  echo   widget::submit_button('choose','Valider');
+  echo   widget::submit('choose','Valider');
   echo widget::hidden('p_action','periode');
   echo "</form>";
   echo '<p class="info"> Pour ajouter, effacer ou modifier une p&eacute;riode, il faut choisir global</p>';
diff --git a/include/poste.inc.php b/include/poste.inc.php
index c863da67e..eed35d007 100644
--- a/include/poste.inc.php
+++ b/include/poste.inc.php
@@ -47,7 +47,7 @@ for ($i=0;$i<sizeof($all);$i++)  {
   $w->name='id';
   $w->value=$i;
   echo $w->IOValue();
-  echo $w->Submit('mod','modifie');
+  echo widget::submit('mod','modifie');
   echo '</FORM>';
   echo '</TD>';
   echo "</TR>";
@@ -70,8 +70,8 @@ if ( isset ($_POST['mod'] ))
   $h->name='p_action';
   $h->value='poste';
   echo $h->IOValue();
-  echo $w->Submit('confirm_mod','Confirme');
-  echo $w->Submit('no','Cancel');
+  echo widget::submit('confirm_mod','Confirme');
+  echo widget::submit('no','Cancel');
   echo "</FORM>";
   echo "</div>";
 
diff --git a/include/postgres.php b/include/postgres.php
index 8ddbd7228..25249995f 100644
--- a/include/postgres.php
+++ b/include/postgres.php
@@ -138,8 +138,8 @@ function ExecSql($p_connection, $p_string) {
   if ( ! $ret )   {
     ob_end_clean();
     throw new Exception (" SQL ERROR $p_string ",1);
-  }
-  ob_flush();
+  } 
+  ob_end_clean();
   return $ret;
 
 }
diff --git a/include/quick_writing.inc.php b/include/quick_writing.inc.php
index 1d2d357d0..fc68b5acf 100644
--- a/include/quick_writing.inc.php
+++ b/include/quick_writing.inc.php
@@ -52,7 +52,7 @@ function show_direct_form($cn,$ledger,$p_array) {
   $op->p_jrn=$id;
   $op->od_direct='t';
   if ($op->count() != 0 )
-    echo widget::submit_button('use_opd','Utilisez une op.pr&eacute;d&eacute;finie');
+    echo widget::submit('use_opd','Utilisez une op.pr&eacute;d&eacute;finie');
   echo $op->show_button();
   echo '</form>';
 
@@ -62,7 +62,7 @@ function show_direct_form($cn,$ledger,$p_array) {
 
   echo $ledger->show_form($p_array);
 
-  echo widget::submit_button('summary','Sauvez');
+  echo widget::submit('summary','Sauvez');
   echo '<div class="info">
     D&eacute;bit = <span id="totalDeb"></span>
     Cr&eacute;dit = <span id="totalCred"></span>
@@ -90,7 +90,7 @@ if ($id == -1 )
      echo dossier::hidden();
      echo widget::hidden('p_action',$_REQUEST['p_action']);
      echo $ledger->select_ledger()->IOValue();
-     echo widget::submit_button('show_form','Choix du journal');
+     echo widget::submit('show_form','Choix du journal');
      echo '</form>';
      echo '</div>';
      exit();
@@ -144,8 +144,8 @@ if ( isset($_POST['summary'])) {
        echo dossier::hidden();
        echo widget::hidden('p_action',$_REQUEST['p_action']);
 
-       echo widget::submit_button('save_it',"Sauver");
-       echo widget::submit_button('correct_it','Corriger');
+       echo widget::submit('save_it',"Sauver");
+       echo widget::submit('correct_it','Corriger');
        
        $chk=new widget('checkbox');
        $chk->selected=false;
diff --git a/include/supplier.inc.php b/include/supplier.inc.php
index d7dc51c7b..fb55fffa1 100644
--- a/include/supplier.inc.php
+++ b/include/supplier.inc.php
@@ -161,9 +161,9 @@ if ( $sub_action == 'detail' )
   $w->value=$f_id;
   echo $w->IOValue();
 
-  echo $w->Submit('mod','Sauver les modifications');
-  echo $w->Reset("Annuler");
-  echo $w->Submit('delete','Effacer cette fiche');
+  echo widget::submit('mod','Sauver les modifications');
+  echo widget::reset("Annuler");
+  echo widget::submit('delete','Effacer cette fiche');
   echo '</form>';
   echo $retour;
   echo '<div>';
diff --git a/include/user_action_ach.php b/include/user_action_ach.php
index ff11c80c3..74ee7212d 100644
--- a/include/user_action_ach.php
+++ b/include/user_action_ach.php
@@ -69,7 +69,7 @@ if ( $action=="use_opd" ) {
    echo $hid->IOValue("jrn_type","ACH");
    
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
    echo $op->show_button();
    
    echo '</form>';
@@ -118,7 +118,7 @@ if ( $action == 'new' ) {
    echo $hid->IOValue("jrn_type","ACH");
    
   if ($op->count() != 0 )
-	echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	echo widget::submit('use_opd','Utilisez une op.prédéfinie');
    echo $op->show_button();
    
    echo '</form>';
@@ -263,7 +263,7 @@ $User=new User($cn);
 $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
 $w->selected=$current;
 
-echo 'P&eacute;riode  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
+echo 'P&eacute;riode  '.widget::submit('gl_submit','Valider');
 ?>
 </form>
 <?php  
@@ -319,7 +319,7 @@ echo 'P&eacute;riode  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_s
    echo "$bar <hr>";
    $hid=new widget();
    if ( $max_ligne != 0 )
-     echo $hid->Submit('paid','Mise à jour paiement');
+     echo widget::submit('paid','Mise à jour paiement');
    echo '</form>';
    echo '</div>';
 }
@@ -387,7 +387,7 @@ if ( $action == 'voir_jrn_non_paye' ) {
     $hid=new widget();
     echo '<hr>';
    if ( $m != 0 )
-     echo $hid->Submit('paid','Mise à jour paiement');
+     echo widget::submit('paid','Mise à jour paiement');
     echo '</form>';
 
     echo '</div>';
diff --git a/include/user_action_fin.php b/include/user_action_fin.php
index 46d205d43..ffdfa10ca 100644
--- a/include/user_action_fin.php
+++ b/include/user_action_fin.php
@@ -98,7 +98,7 @@ if ( $action == 'new' ) {
 	  echo $hid->IOValue("jrn_type","FIN");
 	  
 	  if ($op->count() != 0 )
-		echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+		echo widget::submit('use_opd','Utilisez une op.prédéfinie');
 	  echo $op->show_button();
    
 	  echo '</form>';
@@ -230,7 +230,7 @@ $User=new User($cn);
 $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
 $w->selected=$current;
 
-echo 'Période  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
+echo 'Période  '.widget::submit('gl_submit','Valider');
 ?>
 </form>
 <?php  
diff --git a/include/user_action_gl.php b/include/user_action_gl.php
index bf5439de9..d01f3dc8e 100644
--- a/include/user_action_gl.php
+++ b/include/user_action_gl.php
@@ -53,7 +53,7 @@ $filter_year=" where p_exercice='".$User->get_exercice()."'";
 $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
 $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
 $w->selected=$current;
-echo 'Période  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
+echo 'Période  '.widget::submit('gl_submit','Valider');
 ?>
 </form>
 <?php  
diff --git a/include/user_action_ods.php b/include/user_action_ods.php
index 0a90224ed..72d4dcbe9 100644
--- a/include/user_action_ods.php
+++ b/include/user_action_ods.php
@@ -74,7 +74,7 @@ if ( $action=="use_opd" ) {
   echo $hid->IOValue("jrn_type","ODS");
   
   if ($op->count() != 0 )
-    echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+    echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
 	
   echo '</form>';
@@ -118,7 +118,7 @@ if ( $action == 'new' ) {
 	echo $hid->IOValue("jrn_type","ODS");
 	
 	if ($op->count() != 0 )
-	  echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+	  echo widget::submit('use_opd','Utilisez une op.prédéfinie');
 	echo $op->show_button();
 	
 	echo '</form>';
@@ -263,7 +263,7 @@ $User=new User($cn);
 $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
 $w->selected=$current;
 
-echo 'Période  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
+echo 'Période  '.widget::submit('gl_submit','Valider');
 ?>
 </form>
 <?php  
diff --git a/include/user_action_ven.php b/include/user_action_ven.php
index d23cd76dd..eba1f232f 100644
--- a/include/user_action_ven.php
+++ b/include/user_action_ven.php
@@ -71,7 +71,7 @@ if ( $action=="use_opd" ) {
   echo $hid->IOValue("jrn_type","VEN");
   
   if ($op->count() != 0 )
-    echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+    echo widget::submit('use_opd','Utilisez une op.prédéfinie');
   echo $op->show_button();
   
   echo '</form>';
@@ -134,7 +134,7 @@ if ( $action == 'insert_vente' ) {
 	   echo $hid->IOValue("jrn_type","VEN");
 
 	   if ($op->count() != 0 )
-		 echo widget::submit_button('use_opd','Utilisez une op.prédéfinie');
+		 echo widget::submit('use_opd','Utilisez une op.prédéfinie');
 	   echo $op->show_button();
 
 	   echo '</form>';
@@ -238,7 +238,7 @@ $periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from pa
 $current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
 $w->selected=$current;
 
-echo 'Période  '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
+echo 'Période  '.widget::submit('gl_submit','Valider');
 ?>
 </form>
 <?php  
@@ -305,7 +305,7 @@ echo 'P
 
    echo $list;
    if ( $max_line !=0 )
-     echo $hid->Submit('paid','Mise à jour paiement');
+     echo widget::submit('paid','Mise à jour paiement');
    echo '</FORM>';
    echo "$bar <hr>";
 
@@ -387,7 +387,7 @@ if ( $action == 'voir_jrn_non_paye' ) {
     echo '<hr>';
 
     if ( $m != 0 )
-      echo $hid->Submit('paid','Mise à jour paiement');
+      echo widget::submit('paid','Mise à jour paiement');
 
     echo '</FORM>';
     echo '</div>';