lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: move ajaxziptown in core

Browse Source
This commit is contained in:
Regis Houssin 2010-10-13 13:38:32 +00:00
parent 6809dfa460
commit 5ba0f139a5
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/comm/address.php
View File

@ -27,6 +27,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php");
$langs->load("companies"); $langs->load("companies");
@ -55,8 +56,8 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
$address->label = ($_POST["label"]!=$langs->trans('RequiredField')?$_POST["label"]:''); $address->label = ($_POST["label"]!=$langs->trans('RequiredField')?$_POST["label"]:'');
$address->name = ($_POST["name"]!=$langs->trans('RequiredField')?$_POST["name"]:''); $address->name = ($_POST["name"]!=$langs->trans('RequiredField')?$_POST["name"]:'');
$address->address = $_POST["address"]; $address->address = $_POST["address"];
$address->cp = $_POST["cp"]; $address->cp = $_POST["zipcode"];
$address->ville = $_POST["ville"]; $address->ville = $_POST["town"];
$address->pays_id = $_POST["pays_id"]; $address->pays_id = $_POST["pays_id"];
$address->tel = $_POST["tel"]; $address->tel = $_POST["tel"];
$address->fax = $_POST["fax"]; $address->fax = $_POST["fax"];
@ -159,6 +160,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user-
llxHeader(); llxHeader();
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db);
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
if (!empty($mesg)) print '<div class="error">'.$mesg.'</div>'; if (!empty($mesg)) print '<div class="error">'.$mesg.'</div>';
@ -185,8 +187,8 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
$address->label = $_POST["label"]; $address->label = $_POST["label"];
$address->name = $_POST["name"]; $address->name = $_POST["name"];
$address->address = $_POST["address"]; $address->address = $_POST["address"];
$address->cp = $_POST["cp"]; $address->cp = $_POST["zipcode"];
$address->ville = $_POST["ville"]; $address->ville = $_POST["town"];
$address->tel = $_POST["tel"]; $address->tel = $_POST["tel"];
$address->fax = $_POST["fax"]; $address->fax = $_POST["fax"];
$address->note = $_POST["note"]; $address->note = $_POST["note"];
@ -264,9 +266,15 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
print $address->address; print $address->address;
print '</textarea></td></tr>'; print '</textarea></td></tr>';
print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$address->cp.'">'; // Zip
print '</td></tr>'; print '<tr><td>'.$langs->trans('Zip').'</td><td>';
print '<tr><td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$address->ville.'"></td></tr>'; $formcompany->select_ziptown($address->cp,'zipcode',array('town','selectpays_id'),6);
print '</td></tr>';
// Town
print '<tr><td>'.$langs->trans('Town').'</td><td>';
$formcompany->select_ziptown($address->ville,'town',array('zipcode','selectpays_id'));
print '</td></tr>';
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">'; print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($address->pays_id,'pays_id'); $form->select_pays($address->pays_id,'pays_id');
@ -318,8 +326,8 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
$address->label = $_POST["label"]; $address->label = $_POST["label"];
$address->name = $_POST["name"]; $address->name = $_POST["name"];
$address->address = $_POST["address"]; $address->address = $_POST["address"];
$address->zip = $_POST["zip"]; $address->cp = $_POST["zipcode"];
$address->ville = $_POST["ville"]; $address->ville = $_POST["town"];
$address->pays_id = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id; $address->pays_id = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
$address->tel = $_POST["tel"]; $address->tel = $_POST["tel"];
$address->fax = $_POST["fax"]; $address->fax = $_POST["fax"];
@ -370,10 +378,15 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print $address->address; print $address->address;
print '</textarea></td></tr>'; print '</textarea></td></tr>';
print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$address->cp.'">'; // Zip
print '</td></tr>'; print '<tr><td>'.$langs->trans('Zip').'</td><td>';
$formcompany->select_ziptown($address->cp,'zipcode',array('town','selectpays_id'),6);
print '</td></tr>';
print '<tr><td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$address->ville.'"></td></tr>'; // Town
print '<tr><td>'.$langs->trans('Town').'</td><td>';
$formcompany->select_ziptown($address->ville,'town',array('zipcode','selectpays_id'));
print '</td></tr>';
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($address->pays_id,'pays_id'); $form->select_pays($address->pays_id,'pays_id');

0
htdocs/societe/ajaxziptown.php → htdocs/core/ajaxziptown.php
View File

2
htdocs/core/class/html.formcompany.class.php
View File

@ -617,7 +617,7 @@ class FormCompany
$size=''; $size='';
if (!empty($fieldsize)) $size='size="'.$fieldsize.'"'; if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
if ($conf->use_javascript_ajax) print ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n"; if ($conf->use_javascript_ajax) print ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajaxziptown.php')."\n";
print '<input id="'.$htmlname.'" type="text" name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n"; print '<input id="'.$htmlname.'" type="text" name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
} }