diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 4fd4e512483..96382bdaa59 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -230,7 +230,7 @@ print '| '.$langs->trans("LDAPFieldAddressExample").' | ';
print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ADDRESS?' checked="checked"':'')."> | ";
print '';
-// CP
+// ZIP
$var=!$var;
print '| '.$langs->trans("LDAPFieldZip").' | ';
print '';
@@ -238,7 +238,7 @@ print ' | '.$langs->trans("LDAPFieldZipExample").' | ';
print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_ZIP?' checked="checked"':'')."> | ";
print '
';
-// Ville
+// TOWN
$var=!$var;
print '| '.$langs->trans("LDAPFieldTown").' | ';
print '';
@@ -246,7 +246,7 @@ print ' | '.$langs->trans("LDAPFieldTownExample").' | ';
print 'global->LDAP_KEY_CONTACTS && $conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_TOWN?' checked="checked"':'')."> | ";
print '
';
-// Pays
+// COUNTRY
$var=!$var;
print '| '.$langs->trans("LDAPFieldCountry").' | ';
print '';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index a6207c6b2c4..b8245f2aa34 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -271,7 +271,7 @@ print ' | '.$langs->trans("LDAPFieldAddressExample").' | ';
print ' | ';
print '
';
-// CP
+// ZIP
$var=!$var;
print '| '.$langs->trans("LDAPFieldZip").' | ';
print '';
@@ -279,7 +279,7 @@ print ' | '.$langs->trans("LDAPFieldZipExample").' | ';
print ' | ';
print '
';
-// Ville
+// TOWN
$var=!$var;
print '| '.$langs->trans("LDAPFieldTown").' | ';
print '';
@@ -287,7 +287,7 @@ print ' | '.$langs->trans("LDAPFieldTownExample").' | ';
print ' | ';
print '
';
-// Pays
+// COUNTRY
$var=!$var;
print '| '.$langs->trans("LDAPFieldCountry").' | ';
print '';
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index d3a06304e46..95755a3e59a 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -244,7 +244,7 @@ if ($socid)
// Zip / Town
print ' |
| '.$langs->trans('Zip').' | '.$soc->cp." | ";
- print ''.$langs->trans('Town').' | '.$soc->ville." |
";
+ print ''.$langs->trans('Town').' | '.$soc->town." | ";
// Country
if ($soc->pays)
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 302c47e2d1e..9e0d61f5e2b 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -41,7 +41,7 @@ $socname = GETPOST("socname",'alpha');
$stcomm = GETPOST("stcomm",'int');
$search_nom = GETPOST("search_nom");
$search_zipcode = GETPOST("search_zipcode");
-$search_ville = GETPOST("search_ville");
+$search_town = GETPOST("search_town");
$search_departement = GETPOST("search_departement");
$search_datec = GETPOST("search_datec");
$search_categ = GETPOST("search_categ",'int');
@@ -172,7 +172,7 @@ if ($action == 'cstc')
$formother=new FormOther($db);
-$sql = "SELECT s.rowid, s.nom, s.cp as zip, s.ville, s.datec, s.datea, s.status as status,";
+$sql = "SELECT s.rowid, s.nom, s.cp as zip, s.town, s.datec, s.datea, s.status as status,";
$sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
$sql.= " d.nom as departement";
// Updated by Matelli
@@ -194,7 +194,7 @@ if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_nom) $sql .= " AND s.nom LIKE '%".$db->escape(strtolower($search_nom))."%'";
if ($search_zipcode) $sql .= " AND s.cp LIKE '".$db->escape(strtolower($search_zipcode))."%'";
-if ($search_ville) $sql .= " AND s.ville LIKE '%".$db->escape(strtolower($search_ville))."%'";
+if ($search_town) $sql .= " AND s.town LIKE '%".$db->escape(strtolower($search_town))."%'";
if ($search_departement) $sql .= " AND d.nom LIKE '%".$db->escape(strtolower($search_departement))."%'";
if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
// Insert levels filters
@@ -242,7 +242,7 @@ if ($resql)
llxHeader('',$langs->trans("ThirdParty"),$help_url);
}
- $param='&stcomm='.$stcomm.'&search_nom='.urlencode($search_nom).'&search_zipcode='.urlencode($search_code).'&search_ville='.urlencode($search_ville);
+ $param='&stcomm='.$stcomm.'&search_nom='.urlencode($search_nom).'&search_zipcode='.urlencode($search_code).'&search_town='.urlencode($search_town);
// Added by Matelli
// Store the status filter in the URL
if (isSet($search_cstc))
@@ -294,7 +294,7 @@ if ($resql)
print '';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.cp","",$param,"",$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","",$param,"",$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("State"),$_SERVER["PHP_SELF"],"s.fk_departement","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
@@ -315,7 +315,7 @@ if ($resql)
print '';
print '';
print '| ';
- print '';
+ print '';
print ' | ';
print '';
print '';
@@ -393,7 +393,7 @@ if ($resql)
print $prospectstatic->getNomUrl(1,'prospect');
print ' | ';
print "".$obj->zip." | ";
- print "".$obj->ville." | ";
+ print "".$obj->town." | ";
print ''.$obj->departement.' | ';
// Creation date
print ''.dol_print_date($db->jdate($obj->datec)).' | ';
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 5a40d9796b7..1c10ca0e730 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
@@ -48,6 +48,7 @@ alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address
alter table llx_don CHANGE COLUMN adresse address 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_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);