From 6c2a2181e5a7e3b967f475912c6cc59b1e572296 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 28 Aug 2015 14:00:41 +0200
Subject: [PATCH] Replace name confirm_form by confirm_box

---
 html/js/scripts.js                        |  6 +++---
 include/action.common.inc.php             |  2 +-
 include/ajax_add_menu.php                 |  4 ++--
 include/ajax_create_menu.php              |  2 +-
 include/ajax_get_menu_detail.php          |  2 +-
 include/ajax_get_profile.php              |  6 +++---
 include/ajax_mod_menu.php                 |  2 +-
 include/ajax_plugin_detail.php            |  2 +-
 include/anc_pa.inc.php                    |  4 ++--
 include/card_attr.inc.php                 |  2 +-
 include/category_detail.inc.php           |  2 +-
 include/cfgledger.inc.php                 |  4 ++--
 include/class_document_type.php           |  2 +-
 include/class_fiche_def.php               |  4 ++--
 include/class_html_input.php              |  2 +-
 include/class_periode.php                 | 10 +++++-----
 include/doc_state.inc.php                 |  2 +-
 include/forecast.inc.php                  |  4 ++--
 include/payment_middle.inc.php            |  4 ++--
 include/preod.inc.php                     |  2 +-
 include/template/anc_key_input.php        |  2 +-
 include/template/detail-action.php        |  6 +++---
 include/template/fiche_list.php           |  2 +-
 include/template/ledger_detail_bottom.php |  6 +++---
 include/template/periode_add_exercice.php |  2 +-
 include/template/stock_inv.php            |  2 +-
 include/user_detail.inc.php               |  4 ++--
 27 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 49bd3d3dd..52d60dabf 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1518,7 +1518,7 @@ function display_sub_menu(p_dossier,p_profile,p_dep,p_level)
  */
 function remove_sub_menu(p_dossier,profile_menu_id)
 {
-    confirm_form(null,'Confirme ?', 
+    confirm_box(null,'Confirme ?', 
     function () {
         waiting_box();
         new Ajax.Request('ajax_misc.php',
@@ -2862,14 +2862,14 @@ function init_scroll()
  * Confirm a form thanks a modal dialog Box, it returns true if we agree otherwise
  * false
  * @code
-<form onsubmit="return confirm_form(this,'message')">
+<form onsubmit="return confirm_box(this,'message')">
 </form>
  * @endcode
  * @param p_obj form element (object) or element id (string)
  * @param p_message message to display
  * @returns true or false
  */
-function confirm_form(p_obj, p_message,p_callback_true)
+function confirm_box(p_obj, p_message,p_callback_true)
 {
     waiting_box();
     try {
diff --git a/include/action.common.inc.php b/include/action.common.inc.php
index 6a717cd0b..de913eebf 100644
--- a/include/action.common.inc.php
+++ b/include/action.common.inc.php
@@ -205,7 +205,7 @@ if ($sub_action == 'detail')
 		echo '<input type="hidden" id="delete" name="delete" value="0">';
 		echo HtmlInput::submit("save", "Sauve",' onclick="$(\'delete\').value=0"');
 		echo HtmlInput::submit("add_action_here", _("Ajoute un événement à celui-ci"),' onclick="$(\'delete\').value=0"');
-		echo HtmlInput::submit("delete_bt", _("Efface cet événement "), ' onclick="$(\'delete\').value=1;return confirm_form(\'action_common_frm\',\''. _("Vous confirmez l\'effacement") . '\')" ');
+		echo HtmlInput::submit("delete_bt", _("Efface cet événement "), ' onclick="$(\'delete\').value=1;return confirm_box(\'action_common_frm\',\''. _("Vous confirmez l\'effacement") . '\')" ');
 		echo $retour;
 		echo '</form>';
 	}
diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php
index 2196a2d65..e6ff19079 100644
--- a/include/ajax_add_menu.php
+++ b/include/ajax_add_menu.php
@@ -133,7 +133,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description,
     $pm_default=new ICheckBox('pm_default');
     echo HtmlInput::title_box(_("Nouveau"), $ctl);
     ?>
-    <form method="POST" id="menu_new_frm" onsubmit="return confirm_form('menu_new_frm','<?php echo _('Vous confirmez'); ?> ?')">
+    <form method="POST" id="menu_new_frm" onsubmit="return confirm_box('menu_new_frm','<?php echo _('Vous confirmez'); ?> ?')">
         <?php
         echo HtmlInput::hidden('tab', 'profile_menu_div');
         ?>
@@ -188,7 +188,7 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description,
             return;
         }
         ?>
-        <form method="POST" id="menu_new2_frm" onsubmit="return confirm_form('menu_new2_frm','<?php echo _('Vous confirmez ?') ?>">
+        <form method="POST" id="menu_new2_frm" onsubmit="return confirm_box('menu_new2_frm','<?php echo _('Vous confirmez ?') ?>">
             <?php
             echo HtmlInput::hidden('tab', 'profile_print_div');
             ?>
diff --git a/include/ajax_create_menu.php b/include/ajax_create_menu.php
index c074d019c..a0f70271c 100644
--- a/include/ajax_create_menu.php
+++ b/include/ajax_create_menu.php
@@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class_menu_ref.php';
 $msg="Création";
 $m=new Menu_Ref($cn);
-echo '<form method="POST" id="ajax_create_menu_frm" onsubmit="return confirm_form(this,\'Vous confirmez ?\')">';
+echo '<form method="POST" id="ajax_create_menu_frm" onsubmit="return confirm_box(this,\'Vous confirmez ?\')">';
 echo HtmlInput::hidden('create_menu', 1);
 require_once 'template/menu_detail.php';
 echo HtmlInput::submit('create_menubt','Sauver');
diff --git a/include/ajax_get_menu_detail.php b/include/ajax_get_menu_detail.php
index 490b09080..ff015a830 100644
--- a/include/ajax_get_menu_detail.php
+++ b/include/ajax_get_menu_detail.php
@@ -50,7 +50,7 @@ $pm_default=new ICheckBox('pm_default','1');
 $pm_default->set_check($array[0]['pm_default']);
 
 ?>
-<form method="POST" id="ajax_get_menu_detail_frm" onsubmit="return confirm_form(this,'<?php echo _("Vous confirmez")?> ?')">
+<form method="POST" id="ajax_get_menu_detail_frm" onsubmit="return confirm_box(this,'<?php echo _("Vous confirmez")?> ?')">
 	<?php echo HtmlInput::hidden('pm_id',$array[0]['pm_id'])?>
 	<?php echo HtmlInput::hidden('p_id',$array[0]['p_id'])?>
 	<?php echo HtmlInput::hidden('tab',"profile_menu_div")?>
diff --git a/include/ajax_get_profile.php b/include/ajax_get_profile.php
index cc7a0033a..8dcab3b77 100644
--- a/include/ajax_get_profile.php
+++ b/include/ajax_get_profile.php
@@ -76,7 +76,7 @@ else
 {
 	echo '<div  class="myfieldset" id="profile_gen_div">';
 }
-echo '<form method="POST" id="profile_save_name_frm" onsubmit="return confirm_form(this,\'vous confirmez\')">';
+echo '<form method="POST" id="profile_save_name_frm" onsubmit="return confirm_box(this,\'vous confirmez\')">';
 echo HtmlInput::hidden('tab','profile_gen_div');
 echo HtmlInput::hidden('p_id',$profile->p_id);
 echo HtmlInput::hidden('save_name',1);
@@ -85,7 +85,7 @@ echo HtmlInput::submit("save_namebt",_("Modifier"));
 echo '</form>';
 if ($profile->p_id > 0)
 {
-	echo '<form method="POST" id="profile_clone_frm" onsubmit="return confirm_form(this,\''._("vous confirmez").'\')">';
+	echo '<form method="POST" id="profile_clone_frm" onsubmit="return confirm_box(this,\''._("vous confirmez").'\')">';
 
 	echo _('Vous pouvez aussi copier ce profil et puis le corriger');
 
@@ -94,7 +94,7 @@ if ($profile->p_id > 0)
 	echo HtmlInput::submit("clonebt", "Copier");
 	echo '</form>';
 
-	echo '<form method="POST" id="delete_profile_frm" onsubmit="return confirm_form(this,\''._("vous confirmez").'\')">';
+	echo '<form method="POST" id="delete_profile_frm" onsubmit="return confirm_box(this,\''._("vous confirmez").'\')">';
 
 	echo _('Effacer ce profil');
 
diff --git a/include/ajax_mod_menu.php b/include/ajax_mod_menu.php
index 8fd13e546..7d32b3fe2 100644
--- a/include/ajax_mod_menu.php
+++ b/include/ajax_mod_menu.php
@@ -6,7 +6,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 require_once NOALYSS_INCLUDE.'/class_menu_ref.php';
 $m=new Menu_Ref($cn,$me_code);
 $msg="Modification ".$m->me_code.' '.h($m->me_menu);
-echo '<form method="POST" id="ajax_mod_menu_frm" onsubmit="return confirm_form(this,\'Vous confirmez ?\')">';
+echo '<form method="POST" id="ajax_mod_menu_frm" onsubmit="return confirm_box(this,\'Vous confirmez ?\')">';
 echo HtmlInput::hidden('modify_menu', 1);
 
 require_once NOALYSS_INCLUDE.'/template/menu_detail.php';
diff --git a/include/ajax_plugin_detail.php b/include/ajax_plugin_detail.php
index 184c9f527..bc9a0bdb0 100644
--- a/include/ajax_plugin_detail.php
+++ b/include/ajax_plugin_detail.php
@@ -29,7 +29,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
 $msg=($new==1)?_("Nouvelle extension"):_("Modification"). " ".$me_menu->value;
 echo HtmlInput::title_box($msg, $ctl);
 ?>
-<form method="POST" id="plugin_detail_frm" onsubmit="return confirm_form('plugin_detail_frm','<?php echo _("Vous confirmez");?>')">
+<form method="POST" id="plugin_detail_frm" onsubmit="return confirm_box('plugin_detail_frm','<?php echo _("Vous confirmez");?>')">
 <table>
 	<tr>
 		<TD><?php echo _("Label");?></td>
diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php
index 64ed9cacd..23e6798ae 100644
--- a/include/anc_pa.inc.php
+++ b/include/anc_pa.inc.php
@@ -147,7 +147,7 @@ if ( isset($_REQUEST['sa']))
         $ret.=$po->form();
         $ret.=HtmlInput::hidden('sa','po_update');
         $ret.=HtmlInput::submit('Correction','Correction');
-        $ret.=sprintf('<input type="button" class="smallbutton" value="Efface" onClick="return confirm_form(\'anchor_del\',\' Voulez-vous vraiment effacer cette activité\','
+        $ret.=sprintf('<input type="button" class="smallbutton" value="Efface" onClick="return confirm_box(\'anchor_del\',\' Voulez-vous vraiment effacer cette activité\','
                 . 'function () { window.location=\'do.php?ac='.$_REQUEST['ac'].'&sa=po_delete&po_id=%s&pa_id=%s&'.$str_dossier.'\'}) ;"',
                       $po->id,
                       $_REQUEST['pa_id']
@@ -195,7 +195,7 @@ if ( isset($_REQUEST['sa']))
         $ret.=HtmlInput::button_anchor(_('Efface'),
                 '',
                 'remove_analytic_plan',
-                'onclick="return confirm_form(\'remove_analytic_plan\',\'Effacer ?\',function () {window.location=\'do.php?ac='.$_REQUEST['ac'].'&pa_id='.$_GET['pa_id'].'&sa=pa_delete&'.$str_dossier.'\';})"',
+                'onclick="return confirm_box(\'remove_analytic_plan\',\'Effacer ?\',function () {window.location=\'do.php?ac='.$_REQUEST['ac'].'&pa_id='.$_GET['pa_id'].'&sa=pa_delete&'.$str_dossier.'\';})"',
                 'smallbutton');
         $ret.= '</form>';
         /**
diff --git a/include/card_attr.inc.php b/include/card_attr.inc.php
index e38b4b389..d54f0cb7e 100644
--- a/include/card_attr.inc.php
+++ b/include/card_attr.inc.php
@@ -120,7 +120,7 @@ for ($e=0;$e<count($array);$e++)
         $r.=td($size->input());
         $r.=td($extra->input());
 
-        $remove->javascript=sprintf('confirm_form(\'tb_rmfa\',\'Vous  confirmez ?\',function() { removeCardAttribut(%d,%d,\'tb_rmfa\',$(\'rmfa%d\') );})',
+        $remove->javascript=sprintf('confirm_box(\'tb_rmfa\',\'Vous  confirmez ?\',function() { removeCardAttribut(%d,%d,\'tb_rmfa\',$(\'rmfa%d\') );})',
                                     $row->get_parameter('id'),$gDossier,$e);
         $msg='<span class="notice">'._("Attention : effacera les données qui y sont liées").' </span>';
         $r.=td($remove->input().$msg);
diff --git a/include/category_detail.inc.php b/include/category_detail.inc.php
index 9b27f9075..95e68b954 100644
--- a/include/category_detail.inc.php
+++ b/include/category_detail.inc.php
@@ -68,7 +68,7 @@ if ( ! $p_readonly)
 {
 	echo HtmlInput::submit('mod',_('Sauver les modifications'),' onclick="$(\'action_fiche\').value=\'mod\';"');
 	echo HtmlInput::reset(_("Annuler"));
-	echo HtmlInput::submit('delete_card',_('Effacer cette fiche'),'onclick="$(\'action_fiche\').value=\'delete_card\';return confirm_form(\'catergory_detail_frm\',\''.('Confirmer effacement ?').'\');"');
+	echo HtmlInput::submit('delete_card',_('Effacer cette fiche'),'onclick="$(\'action_fiche\').value=\'delete_card\';return confirm_box(\'catergory_detail_frm\',\''.('Confirmer effacement ?').'\');"');
 	echo '</form>';
 }
 echo '</div>';
diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php
index ac618745f..b0b1bea44 100644
--- a/include/cfgledger.inc.php
+++ b/include/cfgledger.inc.php
@@ -119,9 +119,9 @@ switch ($sa)
 			echo '<form id="cfg_ledger_frm"  method="POST">';
 			echo $ledger->display_ledger();
                         echo HtmlInput::hidden('action_frm','');
-			echo '<INPUT TYPE="SUBMIT" class="smallbutton" VALUE="'._("Sauve").'" name="update" onClick="$(\'action_frm\').value=\'update\';return confirm_form(\'cfg_ledger_frm\',\'Valider ?\')">
+			echo '<INPUT TYPE="SUBMIT" class="smallbutton" VALUE="'._("Sauve").'" name="update" onClick="$(\'action_frm\').value=\'update\';return confirm_box(\'cfg_ledger_frm\',\'Valider ?\')">
 			<INPUT TYPE="RESET" class="smallbutton" VALUE="Reset">
-			<INPUT TYPE="submit" class="smallbutton"  name="efface" value="'._("Efface").'" onClick="$(\'action_frm\').value=\'delete\';return confirm_form(\'cfg_ledger_frm\',\'Vous effacez ce journal ?\')">';
+			<INPUT TYPE="submit" class="smallbutton"  name="efface" value="'._("Efface").'" onClick="$(\'action_frm\').value=\'delete\';return confirm_box(\'cfg_ledger_frm\',\'Vous effacez ce journal ?\')">';
                         $href=http_build_query(array('ac'=>$_REQUEST['ac'],'gDossier'=>$_REQUEST['gDossier']));
                         echo '<a style="display:inline" class="smallbutton" href="do.php?'.$href.'">'._('Retour').'</a>';
 			echo '</FORM>';
diff --git a/include/class_document_type.php b/include/class_document_type.php
index c674731b4..2b4b8f088 100644
--- a/include/class_document_type.php
+++ b/include/class_document_type.php
@@ -80,7 +80,7 @@ class Document_type
 
 			$bt = new IButton('X' . $r[$i]['dt_id']);
 			$bt->label = _('Effacer');
-			$bt->javascript = "confirm_form('X{$r[$i]['dt_id']}','" . _('Vous confirmez') . "',";
+			$bt->javascript = "confirm_box('X{$r[$i]['dt_id']}','" . _('Vous confirmez') . "',";
                         $bt->javascript.="function () { cat_doc_remove('{$r[$i]['dt_id']}','" . Dossier::id() . "');})";
 
 			$tmp['js_remove'] = $bt->input();
diff --git a/include/class_fiche_def.php b/include/class_fiche_def.php
index 495b91e64..3f06a1642 100644
--- a/include/class_fiche_def.php
+++ b/include/class_fiche_def.php
@@ -776,12 +776,12 @@ $order
 		$r.= HtmlInput::submit("save_line_bt", _("Sauvez"),
                         'onclick="$(\'action\').value=\'save_line\'"');
                         
-		$r.=HtmlInput::submit('remove_cat_bt', _('Effacer cette catégorie'), 'onclick="$(\'action\').value=\'remove_cat\';return confirm_form(\'input_detail_frm\',\'' . _('Vous confirmez ?') . '\')"');
+		$r.=HtmlInput::submit('remove_cat_bt', _('Effacer cette catégorie'), 'onclick="$(\'action\').value=\'remove_cat\';return confirm_box(\'input_detail_frm\',\'' . _('Vous confirmez ?') . '\')"');
 		// if there is nothing to remove then hide the button
 		if (strpos($r, "chk_remove") != 0)
 		{
                     $r.=HtmlInput::submit('remove_line_bt', _("Enleve les éléments cochés"), 
-                            'onclick="$(\'action\').value=\'remove_line\';return confirm_form(\'input_detail_frm\',\'' . _('Vous confirmez ?') . '\')"');
+                            'onclick="$(\'action\').value=\'remove_line\';return confirm_box(\'input_detail_frm\',\'' . _('Vous confirmez ?') . '\')"');
 		}
 		$r.= "</form>";
 		$r.=" <p class=\"notice\"> " . _("Attention : il n'y aura pas de demande de confirmation pour enlever les
diff --git a/include/class_html_input.php b/include/class_html_input.php
index f8a16416d..98ded820c 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -905,7 +905,7 @@ class HtmlInput
          */
         static function  button_action_remove_operation($p_operation) 
         {
-            $rmOperation=sprintf("javascript:confirm_form(null,'"._('Voulez-vous effacer cette relation ')."',function ()  {remove_operation('%s','%s');});",
+            $rmOperation=sprintf("javascript:confirm_box(null,'"._('Voulez-vous effacer cette relation ')."',function ()  {remove_operation('%s','%s');});",
 							dossier::id(),
 							$p_operation);
             $js= '<a class="tinybutton" id="acop'.$p_operation.'" href="javascript:void(0)" onclick="'.$rmOperation.'">'.SMALLX.'</a>';
diff --git a/include/class_periode.php b/include/class_periode.php
index 1e35c4558..2f650c33e 100644
--- a/include/class_periode.php
+++ b/include/class_periode.php
@@ -201,7 +201,7 @@ class Periode
                                      from parm_periode
                                      order by p_start,p_end");
             $Max=Database::num_row($Res);
-            echo '<form id="periode_frm" method="POST" onsubmit="return confirm_form(this,\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
+            echo '<form id="periode_frm" method="POST" onsubmit="return confirm_box(this,\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
             echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST);
             echo '<TABLE ALIGN="CENTER">';
             echo "</TR>";
@@ -240,7 +240,7 @@ class Periode
 		    $remove=sprintf(_('Nombre opérations %d'),$l_line['count_op']);
                     $remove=td($remove,' class="mtitle" ');
                     $change=td ('<A class="mtitle" HREF="javascript:void(0)"'
-                            . ' onclick="return confirm_form(null,\''._('Confirmez Réouverture').' ?\',function() {window.location=\'do.php?ac='.$_REQUEST['ac'].'&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'\';} )"> Réouverture</A>',' class="mtitle"');
+                            . ' onclick="return confirm_box(null,\''._('Confirmez Réouverture').' ?\',function() {window.location=\'do.php?ac='.$_REQUEST['ac'].'&action=reopen&p_per='.$l_line['p_id'].'&'.$str_dossier.'\';} )"> Réouverture</A>',' class="mtitle"');
 
                 }
                 else
@@ -268,7 +268,7 @@ class Periode
                             'gDossier'=>Dossier::id()));
                         
                         $remove.='<A class="mtitle" HREF="javascript:void(0)" '
-                                . 'onclick="return confirm_form (null,\''._('Confirmez effacement ?').'\',function() { window.location=\''.$go.'\'});" >'
+                                . 'onclick="return confirm_box (null,\''._('Confirmez effacement ?').'\',function() { window.location=\''.$go.'\'});" >'
                                 . ' Efface</A>';
                     }
                     else
@@ -334,7 +334,7 @@ class Periode
                                    $this->jrn_def_id);
             $jrn_name=Database::fetch_result($r,0,0);
             echo '<h2> Journal '.$jrn_name.'</h2>';
-            echo '<form id="periode_frm" method="POST" onsubmit="return confirm_form(this,\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
+            echo '<form id="periode_frm" method="POST" onsubmit="return confirm_box(this,\'Confirmez-vous la fermeture des périodes choisies ?\')" >';
             echo HtmlInput::array_to_hidden(array('ac','gDossier','jrn_def_id','choose'), $_REQUEST);
 
             echo '<TABLE ALIGN="CENTER">';
@@ -372,7 +372,7 @@ class Periode
                         'jrn_def_id'=>$this->jrn_def_id));
                     
 		  $closed=td ('<A class="mtitle" HREF="javascript:void(0)" '
-                          . 'onclick="return confirm_form(null,\''._('Confirmez Réouverture').' ?\',function() {window.location=\''.$go.'\';} );"> Réouverture</A>',' class="mtitle"');
+                          . 'onclick="return confirm_box(null,\''._('Confirmez Réouverture').' ?\',function() {window.location=\''.$go.'\';} );"> Réouverture</A>',' class="mtitle"');
                 }
                
                 echo "$closed";
diff --git a/include/doc_state.inc.php b/include/doc_state.inc.php
index 914eac824..4ea6eaf1e 100644
--- a/include/doc_state.inc.php
+++ b/include/doc_state.inc.php
@@ -60,7 +60,7 @@ $a_stat=$cn->get_array("select s_value,s_status from document_state order by 1")
 	<?php endfor;?>
 </table>
 <h2>Ajout d'un état</h2>
-<form method="post" id='etat_add_frm' onsubmit="return confirm_form(this,'Vous confirmez ?'); ">
+<form method="post" id='etat_add_frm' onsubmit="return confirm_box(this,'Vous confirmez ?'); ">
 	<p>
 		Nom de l'état <?php $value=new IText("s_value",""); echo $value->input()?>
 	</p>
diff --git a/include/forecast.inc.php b/include/forecast.inc.php
index abe3a7227..18836ccab 100644
--- a/include/forecast.inc.php
+++ b/include/forecast.inc.php
@@ -336,8 +336,8 @@ if (isset($_REQUEST['f_id']) && $sa == "vw")
 	echo HtmlInput::submit('mod_cat_bt', _('Modifier nom ou catégories'),'onclick="$(\'action\').value=\'mod_cat\';"');
 	echo HtmlInput::submit('mod_item_bt', _('Modifier éléments'),'onclick="$(\'action\').value=\'mod_item\';"');
 	//echo HtmlInput::submit('cvs',_('Export CVS'));
-	echo HtmlInput::submit('del_bt', _('Effacer'), 'onclick="$(\'action\').value=\'del\';return confirm_form(\'forecast_frm\',\'' . _('Vous confirmez l\\\' effacement') . '\')"');
-	echo HtmlInput::submit('clone_bt', _('Cloner'), 'onclick="$(\'action\').value=\'clone\';return confirm_form(\'forecast_frm\',\'' . _('Vous confirmez le clonage ') . '\')"');
+	echo HtmlInput::submit('del_bt', _('Effacer'), 'onclick="$(\'action\').value=\'del\';return confirm_box(\'forecast_frm\',\'' . _('Vous confirmez l\\\' effacement') . '\')"');
+	echo HtmlInput::submit('clone_bt', _('Cloner'), 'onclick="$(\'action\').value=\'clone\';return confirm_box(\'forecast_frm\',\'' . _('Vous confirmez le clonage ') . '\')"');
 	echo HtmlInput::hidden('ac', $_REQUEST['ac']);
         $href=http_build_query(array('ac'=>$_REQUEST['ac'],'gDossier'=>$_REQUEST['gDossier']));
         echo '<a style="display:inline" class="smallbutton" href="do.php?'.$href.'">'._('Retour').'</a>';
diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php
index c398c548c..7bfd365c3 100644
--- a/include/payment_middle.inc.php
+++ b/include/payment_middle.inc.php
@@ -43,7 +43,7 @@ if ( $sb=='change')
     if ( !isset($_GET['id'])) exit;
     $row=new Acc_Payment($cn,$_GET['id']);
     $row->load();
-    echo '<form method="post" id="modify_acc_pay_frm" onsubmit="return confirm_form(\'modify_acc_pay_frm\',\''._('Vous confirmez').'\')">';
+    echo '<form method="post" id="modify_acc_pay_frm" onsubmit="return confirm_box(\'modify_acc_pay_frm\',\''._('Vous confirmez').'\')">';
     echo dossier::hidden();
     echo HtmlInput::hidden('sa','mp');
     echo HtmlInput::hidden('sb','save');
@@ -97,7 +97,7 @@ if ($sb=='ins')
 {
     $mp=new Acc_Payment($cn);
     $r=$mp->blank();
-    echo '<form method="POST" id="payment_frm" onsubmit="return confirm_form(this,\'Vous confirmez ?\')">';
+    echo '<form method="POST" id="payment_frm" onsubmit="return confirm_box(this,\'Vous confirmez ?\')">';
     echo dossier::hidden();
     echo HtmlInput::hidden('ac',$_REQUEST['ac']),HtmlInput::hidden('insert',0);
     echo $r;
diff --git a/include/preod.inc.php b/include/preod.inc.php
index b48c233d9..b2c80288e 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -106,7 +106,7 @@ if ( $request_sa== 'jrn' )
         echo $hid->input("jrn",$get_jrn);
 
 	$b='<input type="submit" class="smallbutton" value="'._("Effacer").'"'.
-	  ' onClick="return confirm_form(\'preod_frm\',\''._("Voulez-vous vraiment effacer cette operation ?").'\');" >';
+	  ' onClick="return confirm_box(\'preod_frm\',\''._("Voulez-vous vraiment effacer cette operation ?").'\');" >';
 	   echo $b;
 	   echo '</form>';
 
diff --git a/include/template/anc_key_input.php b/include/template/anc_key_input.php
index c1c7b762e..a4916dbf4 100644
--- a/include/template/anc_key_input.php
+++ b/include/template/anc_key_input.php
@@ -208,5 +208,5 @@
     echo HtmlInput::request_to_hidden(array('gDossier', 'ac'));
     echo HtmlInput::hidden('op','delete_key');
     echo HtmlInput::hidden('key', $this->key->getp('id'));
-   if ($this->key->getp('id') != -1) echo HtmlInput::submit('delete_key', _('Effacer'),'onclick="return confirm_form(\'anc_key_input_frm\',\''._('Confirmer effacement?').'\')"'); ?>
+   if ($this->key->getp('id') != -1) echo HtmlInput::submit('delete_key', _('Effacer'),'onclick="return confirm_box(\'anc_key_input_frm\',\''._('Confirmer effacement?').'\')"'); ?>
 </form>
\ No newline at end of file
diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index 82fd88fb2..effd2ca01 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -193,7 +193,7 @@
 		{
 			if ( $p_view != 'READ' && $p_base != 'ajax')
 			{
-                            $rmAction=sprintf("return confirm_form(null,'"._('Voulez-vous effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
+                            $rmAction=sprintf("return confirm_box(null,'"._('Voulez-vous effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
 					dossier::id(),
 					$action[$o]['ag_id'],$_REQUEST['ag_id']);
                             $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
@@ -271,7 +271,7 @@ for( $c=0;$c<count($acomment);$c++){
 	<?php
         if ( $p_view != 'READ')
 	{
-		$rmComment=sprintf("return confirm_form(null,'"._('Voulez-vous effacer ce commentaire')." ?',function() {remove_comment('%s','%s');});",
+		$rmComment=sprintf("return confirm_box(null,'"._('Voulez-vous effacer ce commentaire')." ?',function() {remove_comment('%s','%s');});",
 						dossier::id(),
 						$acomment[$c]['agc_id']);
 				$js= '<a class="tinybutton" id="accom'.$acomment[$c]['agc_id'].'" href="javascript:void(0)" onclick="'.$rmComment.'">'.SMALLX.'</a>';
@@ -462,7 +462,7 @@ for ($i=0;$i<sizeof($aAttachedFile);$i++) :
         <?php else: ?>
         </span>
         <?php endif;?>
-<?php $rmDoc=sprintf("return confirm_form(null,'"._('Voulez-vous effacer le document')." %s' , function(){remove_document('%s','%s');});",
+<?php $rmDoc=sprintf("return confirm_box(null,'"._('Voulez-vous effacer le document')." %s' , function(){remove_document('%s','%s');});",
 	$aAttachedFile[$i]['d_filename'],
 	dossier::id(),
 	$aAttachedFile[$i]['d_id']);
diff --git a/include/template/fiche_list.php b/include/template/fiche_list.php
index bd7566c79..5c8e5e030 100644
--- a/include/template/fiche_list.php
+++ b/include/template/fiche_list.php
@@ -27,7 +27,7 @@
  */
 ?>
 <?php echo  $bar?>
-<form method="POST" id="fiche_list_frm" class="print" style="display:inline" onsubmit="return confirm_form(this,'<?php echo _("Vous confirmez ?")?>')">
+<form method="POST" id="fiche_list_frm" class="print" style="display:inline" onsubmit="return confirm_box(this,'<?php echo _("Vous confirmez ?")?>')">
 	<table class="sortable" id="fiche_list_table_id">
 		<tr>
 			<th >
diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php
index 471978199..bde34bc87 100644
--- a/include/template/ledger_detail_bottom.php
+++ b/include/template/ledger_detail_bottom.php
@@ -168,7 +168,7 @@ if ($aRap  != null ) {
     $rmReconciliation=new IButton('rmr');
     $rmReconciliation->label=SMALLX;
     $rmReconciliation->class="tinybutton";
-    $rmReconciliation->javascript="return confirm_form(null,'"._("vous confirmez?")."',";
+    $rmReconciliation->javascript="return confirm_box(null,'"._("vous confirmez?")."',";
     $rmReconciliation->javascript.=sprintf('function () { dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',$(\'row%d\'));})',
 					  $gDossier,
 					  $div,
@@ -296,7 +296,7 @@ if ( $div != 'popup' ) {
   {
     $remove=new IButton('Effacer');
     $remove->label=_('Effacer');
-    $remove->javascript="return confirm_form(null,'Vous confirmez effacement ?',function () {removeOperation('".$obj->det->jr_id."',".dossier::id().",'".$div."')})";
+    $remove->javascript="return confirm_box(null,'Vous confirmez effacement ?',function () {removeOperation('".$obj->det->jr_id."',".dossier::id().",'".$div."')})";
     echo $remove->input();
   }
 
@@ -320,7 +320,7 @@ echo '</form>';
   $r.=_("entrez une date")." :".$date->input();
     $r.='<p  style="text-align:center">';
   $r.=HtmlInput::submit('x','accepter',
-          'onclick="confirm_form($(\'form_'.$div.'\'),\'Vous confirmez  ? \',function () {$(\'form_'.$div.'\').divname=\''.$div.'\';reverseOperation($(\'form_'.$div.'\'))}); return false"');
+          'onclick="confirm_box($(\'form_'.$div.'\'),\'Vous confirmez  ? \',function () {$(\'form_'.$div.'\').divname=\''.$div.'\';reverseOperation($(\'form_'.$div.'\'))}); return false"');
     $r.="</p>";
   $r.='</form>';
   echo $r;
diff --git a/include/template/periode_add_exercice.php b/include/template/periode_add_exercice.php
index ff946f245..bab22985c 100644
--- a/include/template/periode_add_exercice.php
+++ b/include/template/periode_add_exercice.php
@@ -12,7 +12,7 @@ pour faire toutes les écritures de fin d'exercice: amortissements, régulations
 </li>
 </ul>
 
-<form method="post" id="exercice_frm" onsubmit="return confirm_form(this,'<?php echo _("Confirmez vous l\'ajout d\'un exercice comptable ?")?>')">
+<form method="post" id="exercice_frm" onsubmit="return confirm_box(this,'<?php echo _("Confirmez vous l\'ajout d\'un exercice comptable ?")?>')">
 <?php 
 echo HtmlInput::hidden("ac",$_REQUEST['ac']);
 echo $nb_exercice->input();
diff --git a/include/template/stock_inv.php b/include/template/stock_inv.php
index d479dfd2c..649382ce9 100644
--- a/include/template/stock_inv.php
+++ b/include/template/stock_inv.php
@@ -28,7 +28,7 @@
  */
 ?>
 <div style="<?php if ( ! $p_readonly) echo "position:absolute";?>" class="content">
-	<form method="POST" id="stock_reprise" class="print" onsubmit="return confirm_form(this,'<?php echo _("Vous confirmez ?")?>')">
+	<form method="POST" id="stock_reprise" class="print" onsubmit="return confirm_box(this,'<?php echo _("Vous confirmez ?")?>')">
 <table>
 	<tr><td>
 			<?php echo _("Date")?>
diff --git a/include/user_detail.inc.php b/include/user_detail.inc.php
index 05a527a9b..52e490195 100644
--- a/include/user_detail.inc.php
+++ b/include/user_detail.inc.php
@@ -172,9 +172,9 @@ $it_pass->value="";
         </tr>
     </table>
     <input type="hidden" name="sbaction" id="sbaction" value="">
-        <input type="Submit" class="button" NAME="SAVE" VALUE="Sauver les changements" onclick="$('sbaction').value='save';return confirm_form('user_detail_frm','Confirmer changement ?');">
+        <input type="Submit" class="button" NAME="SAVE" VALUE="Sauver les changements" onclick="$('sbaction').value='save';return confirm_box('user_detail_frm','Confirmer changement ?');">
 
-        <input type="Submit"  class="button" NAME="DELETE" VALUE="Effacer" onclick="$('sbaction').value='delete';return confirm_form('user_detail_frm','Confirmer effacement ?');" >
+        <input type="Submit"  class="button" NAME="DELETE" VALUE="Effacer" onclick="$('sbaction').value='delete';return confirm_box('user_detail_frm','Confirmer effacement ?');" >
 
 </FORM>
 <?php