diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 02b014d02bf..854e8df1a57 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -265,7 +265,6 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') print ''; print ''.$langs->trans('Zip').''; - if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' '; print ''; print ''.$langs->trans('Town').''; @@ -372,7 +371,6 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print ''; print ''.$langs->trans('Zip').''; - if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' '; print ''; print ''.$langs->trans('Town').''; diff --git a/htdocs/core/searchpostalcode.php b/htdocs/core/searchpostalcode.php deleted file mode 100644 index 685e49e3dd1..00000000000 --- a/htdocs/core/searchpostalcode.php +++ /dev/null @@ -1,226 +0,0 @@ - - * Copyright (C) 2006-2010 Laurent Destailleur - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * *************************************************************************** - * File : searchpostalcode.php - * Author : Eric SEIGNE - * mailto:eric.seigne@ryxeo.com - * http://www.ryxeo.com/ - * Date : 13/06/2005 - * Licence : GNU/GPL Version 2 - * - * Description: - * ------------ - * @author Eric Seigne - * @copyright Eric Seigne 13/06/2005 - * - * ************************************************************************* */ - -/** - * \file htdocs/core/searchpostalcode.php - * \ingroup societe - * \brief Search the city corresponding to the ZIP code entered. 1st round is sought in the company table, if we have two customers in the same city that is direct. If the search never does anything then we start looking in the table of postcodes. - * \version $Id$ - */ - -require("../main.inc.php"); - -$langs->load("companies"); - -// Security Access Client -if ($user->societe_id > 0) -{ - $_GET["action"] = ''; - $_POST["action"] = ''; - $_GET["socid"] = $user->societe_id; -} - -// Entry parameter are -// $_GET = array -// 'cp' => string '78180' (length=5) -// 'targettown' => string 'window.opener.document.formsoc.ville' (length=36) -// 'targetcountry' => string 'window.opener.document.formsoc.pays_id' (length=38) -// 'targetstate' - -/* - * View - */ - -$javascript=" -\n"; - - -top_htmlhead("", $langs->trans("SearchTown")); - -// Same as llxHeader. Open what llxFooter close -print ''; - -print $javascript; - -print "

"; // Ouvre div a la place de top_menu car le llxFooter en ferme un - -print "
"; -print ''; -print ""; -print ""; -print " "; -print "\n"; - -$num=0; - -$result = run_request("societe"); -if ($result) -{ - $num=$db->num_rows($result); - //print 'sql='.$sql.' num='.$num; exit; - if($num == 0) - { - if ($conf->global->MAIN_AUTOFILL_TOWNFROMZIP == 2) - { - $result = run_request("postalcode"); // If a table llx_postalcode exists - $num=$db->num_rows($result); - } - } - - $showselect=1; - - // If it has not, or only one result on switch and fill the form - if($num <= 1) - { - $obj = $db->fetch_object($result); - $ville = $obj->ville; - $ville_code = urlencode("$ville"); - print ""; - } - else - { - // Otherwise it displays the list of cities which is the postal code ... - for ($i = 0; $i < $num; $i++) - { - $obj = $db->fetch_object($result); - - $cp = $obj->cp; - $ville = $obj->ville; - $ville_code = urlencode("$ville"); - - $dep = $obj->fk_departement; - $dep_lib = $obj->fk_departement; - - $country_code = $obj->pays_code; - $temp=$obj->pays_code?$langs->transcountry("Country",$obj->pays_code):''; - if ($temp == 'Country') $temp=$obj->pays_lib; - $country_lib = $temp; - - $var=!$var; - print ""; - print ''; - print "'; - print ''; - print ""; - } - } -} - - -$var=!$var; -print ""; - -print "
"; -print " Recherche code postal: " . $_GET['cp'] . " "; -print "
"; - if ($ville && $ville_code) - { - print ''; - print "\n"; - } - else - { - $langs->load("errors"); - print $langs->trans("ErrorRecordNotFound"); - $showselect=0; - } - print "
'.$country_lib.'"; - print ''.$cp.''.$ville.'
"; -print "
"; -if ($showselect) -{ - print "trans("Select")."\">"; - print "   "; -} -print "trans("Cancel")."\" onClick=\"window.close();\">"; -print "

\n"; - -$db->close(); - -llxFooter('$Date$ - $Revision$',0); - - -/** - * Return cursor on request to find zip/town - * - * @param $table - * @return cursor - */ -function run_request($table) -{ - global $db; - $cp=isset($_GET["cp"])?trim($_GET["cp"]):''; - - $sql = "SELECT DISTINCT cp, ville, fk_departement, fk_pays, p.code as pays_code, p.libelle as pays_lib"; - $sql.= " FROM ".MAIN_DB_PREFIX.$table; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_pays as p ON fk_pays = p.rowid'; - $sql.= " WHERE"; - if ($cp) - { - $cp=str_replace('*','%',$cp); - $sql.= " cp LIKE '".addslashes($cp)."' AND"; - $sql.= " (ville IS NOT NULL OR fk_departement IS NOT NULL OR fk_pays IS NOT NULL)"; - } - else $sql.= " cp != '' AND cp IS NOT NULL"; - $sql.= " ORDER by fk_pays, ville, cp"; - $sql.= $db->plimit(50); // Avoid pb with bad criteria - - //print $sql.'
'; - $result=$db->query($sql); - if (!$result) - { - dol_print_error($db); - exit; - } - - return $result; -} - -?> diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index 972074c75b1..bcb05299d6f 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -11,24 +11,6 @@ // -/*================================================================= - Purpose: Pour la fonction de saisie auto des villes - Input: postalcode,objecttown,objectcountry,objectstate - Author: Eric Seigne - Licence: GPL -==================================================================*/ -function autofilltownfromzip_PopupPostalCode(url_root, postalcode,objecttown,objectcountry,objectstate) -{ - var url = url_root + '/core/searchpostalcode.php?cp=' + postalcode; - url = url + '&targettown=window.opener.document.formsoc.' + objecttown.name; - url = url + '&targetcountry=window.opener.document.formsoc.' + objectcountry.name; - url = url + '&targetstate=window.opener.document.formsoc.' + objectstate.name; - // alert(url); - var hWnd = window.open(url, "SearchPostalCodeWindow", "width=" + 300 + ",height=" + 150 + ",resizable=yes,scrollbars=yes"); - if((document.window != null) && (!hWnd.opener)) hWnd.opener = document.window; -} - - /* * ================================================================= * Purpose: