diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 5427c510349..5386be19940 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -138,7 +138,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
// Confirmation par popup ajax
$var=!$var;
print '
| '.$langs->trans("ConfirmAjax").' | ';
- print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,0);
+ print $html->selectyesno('main_confirm_ajax',isset($conf->global->MAIN_CONFIRM_AJAX)?$conf->global->MAIN_CONFIRM_AJAX:0,1);
print ' ('.$langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled").')';
print ' |
';
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 68227c2a998..10c91b8dd44 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1164,7 +1164,7 @@ if ($_GET['propalid'] > 0)
print '';
if ($conf->global->PRODUIT_CONFIRM_DELETE_LINE)
{
- if ($conf->use_ajax)
+ if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{
$url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&ligne='.$objp->rowid.'&action=confirm_deleteline&confirm=yes';
print 'trans("No").'\')">';
@@ -1458,7 +1458,7 @@ if ($_GET['propalid'] > 0)
if ($propal->statut == 0 && $propal->total_ttc > 0 && $user->rights->propale->valider)
{
print 'use_ajax)
+ if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{
$url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=confirm_validate&confirm=yes';
print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmValidateProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\')"';
@@ -1508,7 +1508,7 @@ if ($_GET['propalid'] > 0)
print ''."\n";
print 'use_ajax)
+ if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{
print 'href="#" onClick="dialogInfo($(\'confirm_close\').innerHTML)"'."\n";
}
@@ -1523,7 +1523,7 @@ if ($_GET['propalid'] > 0)
if ($propal->statut == 0 && $user->rights->propale->supprimer)
{
print 'use_ajax)
+ if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX)
{
$url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=confirm_delete&confirm=yes';
print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmDeleteProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\')"';
|