diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 971388d62c8..d0ad081e92e 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -65,7 +65,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] trans("Zip").' / '.$langs->trans("Town"); ?> - control->tpl['zip'].$this->control->tpl['ville']; ?> + control->tpl['zip'].$this->control->tpl['town']; ?> diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index b835879b6cc..17e646b5a8d 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -46,7 +46,6 @@ class Contact extends CommonObject var $address; var $cp; // TODO deprecated var $zip; - var $ville; // TODO deprecated var $town; var $fk_departement; // deprecated @@ -225,7 +224,7 @@ class Contact extends CommonObject $this->phone_mobile=trim($this->phone_mobile); $this->fax=trim($this->fax); $this->zip=($this->zip?$this->zip:$this->cp); - $this->town=($this->town?$this->town:$this->ville); + $this->town=($this->town?$this->town:$this->town); $this->country_id=($this->country_id > 0?$this->country_id:$this->fk_pays); $this->state_id=($this->state_id > 0?$this->state_id:$this->fk_departement); @@ -239,7 +238,7 @@ class Contact extends CommonObject $sql .= ", firstname='".$this->db->escape($this->firstname)."'"; $sql .= ", address='".$this->db->escape($this->address)."'"; $sql .= ", cp='".$this->db->escape($this->zip)."'"; - $sql .= ", ville='".$this->db->escape($this->town)."'"; + $sql .= ", town='".$this->db->escape($this->town)."'"; $sql .= ", fk_pays=".($this->country_id>0?$this->country_id:'NULL'); $sql .= ", fk_departement=".($this->state_id>0?$this->state_id:'NULL'); $sql .= ", poste='".$this->db->escape($this->poste)."'"; @@ -367,7 +366,7 @@ class Contact extends CommonObject } if ($this->address && ! empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address; if ($this->cp && ! empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->cp; - if ($this->ville && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->ville; + if ($this->town && ! empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town; if ($this->country_code && ! empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code; if ($this->phone_pro && ! empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro; if ($this->phone_perso && ! empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso; @@ -484,7 +483,7 @@ class Contact extends CommonObject $langs->load("companies"); $sql = "SELECT c.rowid, c.fk_soc, c.civilite as civilite_id, c.name as lastname, c.firstname,"; - $sql.= " c.address, c.cp as zip, c.ville as town,"; + $sql.= " c.address, c.cp as zip, c.town as town,"; $sql.= " c.fk_pays as country_id,"; $sql.= " c.fk_departement,"; $sql.= " c.birthday,"; @@ -494,7 +493,7 @@ class Contact extends CommonObject $sql.= " p.libelle as country, p.code as country_code,"; $sql.= " d.nom as state, d.code_departement as state_code,"; $sql.= " u.rowid as user_id, u.login as user_login,"; - $sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.ville as soccity, s.default_lang as socdefault_lang"; + $sql.= " s.nom as socname, s.address as socaddress, s.cp as soccp, s.town as soccity, s.default_lang as socdefault_lang"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid"; @@ -522,7 +521,6 @@ class Contact extends CommonObject $this->address = $obj->address; $this->cp = $obj->zip; // TODO deprecated $this->zip = $obj->zip; - $this->ville = $obj->town; // TODO deprecated $this->town = $obj->town; $this->fk_departement = $obj->fk_departement; // deprecated diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 2926ec75b75..4151a2f078b 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -885,7 +885,7 @@ else print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; print $object->cp; if ($object->cp) print ' '; - print $object->ville.''; + print $object->town.''; // Country print ''.$langs->trans("Country").''; diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index 0448bb519e0..9638c5ff188 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -54,8 +54,8 @@ $v->setPhoneNumber($contact->phone_pro, "PREF;WORK;VOICE"); $v->setPhoneNumber($contact->phone_mobile, "CELL;VOICE"); $v->setPhoneNumber($contact->fax, "WORK;FAX"); -$v->setAddress("", "", $contact->address, $contact->ville, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK;POSTAL"); -$v->setLabel("", "", $contact->address, $contact->ville, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK"); +$v->setAddress("", "", $contact->address, $contact->town, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK;POSTAL"); +$v->setLabel("", "", $contact->address, $contact->town, "", $contact->cp, ($contact->pays_code?$contact->pays:''), "WORK"); $v->setEmail($contact->email,'internet,pref'); $v->setNote($contact->note); @@ -67,7 +67,7 @@ if ($company->id) $v->setURL($company->url, "WORK"); if (! $contact->phone_pro) $v->setPhoneNumber($company->tel, "WORK;VOICE"); if (! $contact->fax) $v->setPhoneNumber($company->fax, "WORK;FAX"); - if (! $contact->cp) $v->setAddress("", "", $company->address, $company->ville, "", $company->cp, $company->pays_code, "WORK;POSTAL"); + if (! $contact->cp) $v->setAddress("", "", $company->address, $company->town, "", $company->cp, $company->pays_code, "WORK;POSTAL"); if ($company->email != $contact->email) $v->setEmail($company->email,'internet'); // Si contact lie a un tiers non de type "particulier" if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom); diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index ad5f77a422f..a085eed35f1 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -50,6 +50,7 @@ alter table llx_don CHANGE COLUMN ville town text; alter table llx_adherent CHANGE COLUMN adresse address text; alter table llx_adherent CHANGE COLUMN ville town text; alter table llx_societe CHANGE COLUMN ville town text; +alter table llx_socpeople CHANGE COLUMN ville town text; alter table llx_bank_account CHANGE COLUMN adresse_proprio owner_address text; INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0);