english standardization

htdocs/compta/clients.php

@@ -93,7 +93,7 @@ if ($mode == 'search') {
  * Mode List
  */
 
-$sql = "SELECT s.rowid, s.nom, s.client, s.ville, s.datec, s.datea";
+$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea";
 $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -148,7 +148,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","","",'valign="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","","",'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec",$addu,"",'align="right"',$sortfield,$sortorder);
@@ -190,7 +190,7 @@ if ($resql)
 		$thirdpartystatic->client=$obj->client;
 		print $thirdpartystatic->getNomUrl(1,'compta');
 		print '</td>';
-		print '<td>'.$obj->ville.'&nbsp;</td>';
+		print '<td>'.$obj->town.'&nbsp;</td>';
 		print '<td align="left">'.$obj->code_client.'&nbsp;</td>';
 		print '<td align="left">'.$obj->code_compta.'&nbsp;</td>';
 		print '<td align="right">'.dol_print_date($db->jdate($obj->datec)).'</td>';

htdocs/compta/dons/fiche.php

@@ -91,7 +91,7 @@ if ($action == 'update')
 		$don->address     = $_POST["address"];
 		$don->amount      = price2num($_POST["amount"]);
 		$don->cp          = $_POST["zipcode"];
-		$don->ville       = $_POST["town"];
+		$don->town        = $_POST["town"];
         $don->zip         = $_POST["zipcode"];
         $don->town        = $_POST["town"];
 		$don->email       = $_POST["email"];
@@ -143,7 +143,7 @@ if ($action == 'add')
 		$don->address     = $_POST["address"];
 		$don->amount      = price2num($_POST["amount"]);
 		$don->cp          = $_POST["zipcode"];
-		$don->ville       = $_POST["town"];
+		$don->town        = $_POST["town"];
         $don->zip         = $_POST["zipcode"];
         $don->town        = $_POST["town"];
 		$don->email       = $_POST["email"];
@@ -488,7 +488,7 @@ if (! empty($id) && $action != 'edit')
 	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($don->address).'</td></tr>';
 
 	// Zip / Town
-	print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.($don->cp && $don->ville?' / ':'').$don->ville.'</td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.($don->cp && $don->town?' / ':'').$don->town.'</td></tr>';
 
 	// Country
 	print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';