From 890b9ca44a911f09808971ceb35a11ee2d84e630 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 22 Feb 2013 16:27:58 +0100
Subject: [PATCH]  english standardization

---
 htdocs/compta/dons/class/don.class.php        | 20 +++++++++----------
 .../install/mysql/migration/3.3.0-3.4.0.sql   |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 4942c8f3f7e..f2c3a6f0704 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -44,7 +44,7 @@ class Don extends CommonObject
     var $societe;
     var $address;
     var $cp;
-    var $ville;
+    var $town;
     var $pays;
     var $email;
     var $public;
@@ -190,7 +190,7 @@ class Don extends CommonObject
         $this->societe = 'The Company';
         $this->address = 'Twist road';
         $this->cp = '99999';
-        $this->ville = 'Town';
+        $this->town = 'Town';
         $this->note_public='SPECIMEN';
         $this->email='email@email.com';
         $this->note='';
@@ -229,7 +229,7 @@ class Don extends CommonObject
             $err++;
         }
 
-        if (dol_strlen(trim($this->ville)) == 0)
+        if (dol_strlen(trim($this->town)) == 0)
         {
             $error_string[$err] = "La ville saisie est invalide";
             $err++;
@@ -299,7 +299,7 @@ class Don extends CommonObject
         // Clean parameters
         $this->address=($this->address>0?$this->address:$this->address);
         $this->zip=($this->zip>0?$this->zip:$this->cp);
-        $this->town=($this->town>0?$this->town:$this->ville);
+        $this->town=($this->town>0?$this->town:$this->town);
         $this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
         $this->country=($this->country?$this->country:$this->pays);
 
@@ -315,7 +315,7 @@ class Don extends CommonObject
         $sql.= ", societe";
         $sql.= ", address";
         $sql.= ", cp";
-        $sql.= ", ville";
+        $sql.= ", town";
         $sql.= ", pays";
         $sql.= ", public";
         $sql.= ", fk_don_projet";
@@ -384,7 +384,7 @@ class Don extends CommonObject
         // Clean parameters
         $this->address=($this->address>0?$this->address:$this->address);
         $this->zip=($this->zip>0?$this->zip:$this->cp);
-        $this->town=($this->town>0?$this->town:$this->ville);
+        $this->town=($this->town>0?$this->town:$this->town);
         $this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
         $this->country=($this->country?$this->country:$this->pays);
 
@@ -396,7 +396,7 @@ class Don extends CommonObject
         $sql .= ",societe='".$this->db->escape($this->societe)."'";
         $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 .= ",pays='".$this->db->escape($this->country)."'"; // TODO use country_id
         $sql .= ",public=".$this->public;
         $sql .= ",fk_don_projet=".($this->fk_project>0?$this->fk_project:'null');
@@ -463,7 +463,7 @@ class Don extends CommonObject
         global $conf;
 
         $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,";
-        $sql.= " d.prenom, d.nom, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
+        $sql.= " d.prenom, d.nom, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.town, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
         $sql.= " p.title as project_label";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet";
@@ -489,9 +489,9 @@ class Don extends CommonObject
                 $this->statut         = $obj->fk_statut;
                 $this->address        = $obj->address;
                 $this->cp             = $obj->cp;
-                $this->ville          = $obj->ville;
+                $this->town           = $obj->town;
                 $this->zip            = $obj->cp;
-                $this->town           = $obj->ville;
+                $this->town           = $obj->town;
                 $this->email          = $obj->email;
                 $this->phone          = $obj->phone;
                 $this->phone_mobile   = $obj->phone_mobile;
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 1c10ca0e730..ad5f77a422f 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
@@ -46,6 +46,7 @@ alter table llx_extrafields add column param text after pos;
 alter table llx_propal   CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;
 alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;
 alter table llx_don      CHANGE COLUMN adresse address text;
+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;