Skip to content
Snippets Groups Projects
Commit 0eca8982 authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: ajout traitement pour la liste déroulante des pays dans configuration->societe

parent f210f766
Branches
Tags
No related merge requests found
...@@ -115,20 +115,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') ...@@ -115,20 +115,6 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
/** /**
* Edition des paramtres * Edition des paramtres
*/ */
if ($conf->use_javascript)
{
print '
<script language="javascript" type="text/javascript">
<!--
function save_refresh()
{
document.form_index.action.value="updateedit";
document.form_index.submit();
}
-->
</script>
';
}
print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">'; print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
...@@ -155,7 +141,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit') ...@@ -155,7 +141,7 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("Country").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("Country").'</td><td>';
$form->select_pays($conf->global->MAIN_INFO_SOCIETE_PAYS,'pays_id',($conf->use_javascript?' onChange="save_refresh()"':'')); $form->select_pays($conf->global->MAIN_INFO_SOCIETE_PAYS,'pays_id',($conf->use_javascript?' onChange="company_save_refresh()"':''));
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
......
...@@ -327,15 +327,21 @@ class Form ...@@ -327,15 +327,21 @@ class Form
$pays_id = $obj->rowid?$obj->rowid:''; $pays_id = $obj->rowid?$obj->rowid:'';
// On applique un delai d'execution pour le bon fonctionnement // On applique un delai d'execution pour le bon fonctionnement
$mode = substr($htmloption,-9,6); $mode_create = substr($htmloption,-9,6);
if ($mode == 'create') $mode_edit = substr($htmloption,-7,4);
$mode_company = substr($htmloption,-10,7);
if ($mode_create == 'create')
{ {
$htmloption = 'onChange="ac_delay(\'autofilltownfromzip_save_refresh_create()\',\'500\')"'; $htmloption = 'onChange="ac_delay(\'autofilltownfromzip_save_refresh_create()\',\'500\')"';
} }
else else if ($mode_edit == 'edit')
{ {
$htmloption = 'onChange="ac_delay(\'autofilltownfromzip_save_refresh_edit()\',\'500\')"'; $htmloption = 'onChange="ac_delay(\'autofilltownfromzip_save_refresh_edit()\',\'500\')"';
} }
else if ($mode_company == 'refresh')
{
$htmloption = 'onChange="ac_delay(\'company_save_refresh()\',\'500\')"';
}
print '<div>'; print '<div>';
print '<input type="text" size="45" id="pays" name="pays" value="'.$obj->libelle.'" '.$htmloption.' />'; print '<input type="text" size="45" id="pays" name="pays" value="'.$obj->libelle.'" '.$htmloption.' />';
......
...@@ -35,6 +35,12 @@ function autofilltownfromzip_save_refresh_create() ...@@ -35,6 +35,12 @@ function autofilltownfromzip_save_refresh_create()
document.formsoc.submit(); document.formsoc.submit();
} }
function company_save_refresh()
{
document.form_index.action.value="updateedit";
document.form_index.submit();
}
/*================================================================= /*=================================================================
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment