diff --git a/htdocs/lib/lib.js b/htdocs/lib/lib.js index e1d5a71b1b0f9da9f0a887b6425bb1171bd753a7..2653a9fd698eb57cba7789581b0306c0f7878922 100644 --- a/htdocs/lib/lib.js +++ b/htdocs/lib/lib.js @@ -2,7 +2,7 @@ // Pour la fonction de saisi auto des villes // ***************************************** -function PopupPostalCode(postalcode,objectville) +function autofilltownfromzip_PopupPostalCode(postalcode,objectville) { var url = 'searchpostalcode.php?cp=' + postalcode + '&targetobject=window.opener.document.formsoc.' + objectville.name; // alert(url); @@ -10,12 +10,18 @@ function PopupPostalCode(postalcode,objectville) if((document.window != null) && (!hWnd.opener)) hWnd.opener = document.window; } -function save_refresh() +function autofilltownfromzip_save_refresh_edit() { document.formsoc.action.value="edit"; document.formsoc.submit(); } +function autofilltownfromzip_save_refresh_create() +{ + document.formsoc.action.value="create"; + document.formsoc.submit(); +} + // Pour la saisie des dates par calendrier // *************************************** diff --git a/htdocs/soc.php b/htdocs/soc.php index 9a0cd25cd5ad0aa5d32c4ba5a319b9b9b8d5a1e9..958809f2a79f25d1b5fd2140be610684d5cfc19e 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -216,24 +216,6 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') print '</div>'; } - if ($conf->global->MAIN_AUTO_FILLTOWNFROMZIP) - { - include("./soc.js.php"); - } - - print ' - <script language="javascript" type="text/javascript"> - <!-- - function save_refresh() - { - document.formsoc.action.value="create"; - document.formsoc.submit(); - // location.href = "index.php?action=updateedit"; - } - --> - </script> - '; - print '<form action="soc.php" method="post" name="formsoc">'; print '<input type="hidden" name="action" value="add">'; @@ -269,14 +251,14 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') print '</textarea></td></tr>'; print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'"'; - if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="PopupPostalCode(cp.value,ville)"'; + if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="autofilltownfromzip_PopupPostalCode(cp.value,ville)"'; print '>'; - if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">'; + if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(cp.value,ville)">'; print '</td>'; print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>'; print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">'; - $form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="save_refresh()"':''); + $form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="autofilltownfromzip_save_refresh_create()"':''); print '</td></tr>'; print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'; @@ -489,15 +471,15 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print '</textarea></td></tr>'; print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'"'; - if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="PopupPostalCode(cp.value,ville)"'; + if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' onChange="autofilltownfromzip_PopupPostalCode(cp.value,ville)"'; print '>'; - if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="PopupPostalCode(cp.value,ville)">'; + if ($conf->use_javascript && $conf->global->MAIN_AUTO_FILLTOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(cp.value,ville)">'; print '</td>'; print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>'; print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'; - $form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="save_refresh()"':''); + $form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript?' onChange="autofilltownfromzip_save_refresh_edit()"':''); print '</td></tr>'; print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';