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

Fix: uniformize code

Fix: use zip/town autocomplete
parent 96e0dac7
No related branches found
No related tags found
No related merge requests found
...@@ -261,8 +261,8 @@ class ActionsContactCardCommon ...@@ -261,8 +261,8 @@ class ActionsContactCardCommon
$this->object->civilite_id = $_POST["civilite_id"]; $this->object->civilite_id = $_POST["civilite_id"];
$this->object->poste = $_POST["poste"]; $this->object->poste = $_POST["poste"];
$this->object->address = $_POST["address"]; $this->object->address = $_POST["address"];
$this->object->cp = $_POST["zipcode"]; $this->object->zip = $_POST["zipcode"];
$this->object->ville = $_POST["town"]; $this->object->town = $_POST["town"];
$this->object->fk_pays = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id; $this->object->fk_pays = $_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
$this->object->fk_departement = $_POST["departement_id"]; $this->object->fk_departement = $_POST["departement_id"];
$this->object->phone_pro = $_POST["phone_pro"]; $this->object->phone_pro = $_POST["phone_pro"];
......
...@@ -46,8 +46,10 @@ class Contact extends CommonObject ...@@ -46,8 +46,10 @@ class Contact extends CommonObject
var $name; var $name;
var $firstname; var $firstname;
var $address; var $address;
var $cp; var $cp; // TODO deprecated
var $ville; var $zip;
var $ville; // TODO deprecated
var $town;
var $fk_departement; // Id of department var $fk_departement; // Id of department
var $departement_code; // Code of department var $departement_code; // Code of department
...@@ -210,8 +212,8 @@ class Contact extends CommonObject ...@@ -210,8 +212,8 @@ class Contact extends CommonObject
$sql .= ", name='".$this->db->escape($this->name)."'"; $sql .= ", name='".$this->db->escape($this->name)."'";
$sql .= ", firstname='".$this->db->escape($this->firstname)."'"; $sql .= ", firstname='".$this->db->escape($this->firstname)."'";
$sql .= ", address='".$this->db->escape($this->address)."'"; $sql .= ", address='".$this->db->escape($this->address)."'";
$sql .= ", cp='".$this->db->escape($this->cp)."'"; $sql .= ", cp='".$this->db->escape($this->zip)."'";
$sql .= ", ville='".$this->db->escape($this->ville)."'"; $sql .= ", ville='".$this->db->escape($this->town)."'";
$sql .= ", fk_pays=".($this->fk_pays>0?$this->fk_pays:'NULL'); $sql .= ", fk_pays=".($this->fk_pays>0?$this->fk_pays:'NULL');
$sql .= ", fk_departement=".($this->fk_departement>0?$this->fk_departement:'NULL'); $sql .= ", fk_departement=".($this->fk_departement>0?$this->fk_departement:'NULL');
$sql .= ", poste='".$this->db->escape($this->poste)."'"; $sql .= ", poste='".$this->db->escape($this->poste)."'";
......
...@@ -146,8 +146,8 @@ else ...@@ -146,8 +146,8 @@ else
$object->civilite_id = $_POST["civilite_id"]; $object->civilite_id = $_POST["civilite_id"];
$object->poste = $_POST["poste"]; $object->poste = $_POST["poste"];
$object->address = $_POST["address"]; $object->address = $_POST["address"];
$object->cp = $_POST["cp"]; $object->zip = $_POST["zipcode"];
$object->ville = $_POST["ville"]; $object->town = $_POST["town"];
$object->fk_pays = $_POST["pays_id"]; $object->fk_pays = $_POST["pays_id"];
$object->fk_departement = $_POST["departement_id"]; $object->fk_departement = $_POST["departement_id"];
$object->email = $_POST["email"]; $object->email = $_POST["email"];
...@@ -239,8 +239,8 @@ else ...@@ -239,8 +239,8 @@ else
$object->poste = $_POST["poste"]; $object->poste = $_POST["poste"];
$object->address = $_POST["address"]; $object->address = $_POST["address"];
$object->cp = $_POST["cp"]; $object->zip = $_POST["zipcode"];
$object->ville = $_POST["ville"]; $object->town = $_POST["town"];
$object->fk_departement = $_POST["departement_id"]; $object->fk_departement = $_POST["departement_id"];
$object->fk_pays = $_POST["pays_id"]; $object->fk_pays = $_POST["pays_id"];
...@@ -514,10 +514,12 @@ else ...@@ -514,10 +514,12 @@ else
print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>'; print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
// Zip / Town // Zip / Town
if (($objsoc->typent_code == 'TE_PRIVATE') && dol_strlen(trim($object->cp)) == 0) $object->cp = $objsoc->cp; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE') && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip; // Predefined with third party
if (($objsoc->typent_code == 'TE_PRIVATE') && dol_strlen(trim($object->ville)) == 0) $object->ville = $objsoc->ville; // Predefined with third party if (($objsoc->typent_code == 'TE_PRIVATE') && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town; // Predefined with third party
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3"><input name="cp" type="text" size="6" maxlength="80" value="'.(isset($_POST["cp"])?$_POST["cp"]:$object->cp).'">&nbsp;'; print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">';
print '<input name="ville" type="text" size="20" value="'.(isset($_POST["ville"])?$_POST["ville"]:$object->ville).'" maxlength="80"></td></tr>'; print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6).'&nbsp;';
print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</td></tr>';
// Country // Country
if (dol_strlen(trim($object->fk_pays)) == 0) $object->fk_pays = $objsoc->pays_id; // Predefined with third party if (dol_strlen(trim($object->fk_pays)) == 0) $object->fk_pays = $objsoc->pays_id; // Predefined with third party
...@@ -686,8 +688,10 @@ else ...@@ -686,8 +688,10 @@ else
print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>'; print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
// Zip / Town // Zip / Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3"><input name="cp" type="text" size="6" maxlength="80" value="'.(isset($_POST["cp"])?$_POST["cp"]:$object->cp).'">&nbsp;'; print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">';
print '<input name="ville" type="text" size="20" value="'.(isset($_POST["ville"])?$_POST["ville"]:$object->ville).'" maxlength="80"></td></tr>'; print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6).'&nbsp;';
print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</td></tr>';
// Country // Country
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment