From 36ce7a9a10aa150e360f8de3fdfbbc839208a80a Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Sun, 24 Feb 2013 14:11:09 +0100
Subject: [PATCH] some fix for english language standardization

---
 htdocs/install/mysql/migration/3.3.0-3.4.0.sql    | 1 +
 htdocs/societe/class/companybankaccount.class.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

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 385fe9df9cc..ada566e49f3 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
@@ -61,6 +61,7 @@ alter table llx_societe  CHANGE COLUMN ville town text;
 alter table llx_socpeople  CHANGE COLUMN name lastname varchar(50);
 alter table llx_socpeople  CHANGE COLUMN ville town text;
 alter table llx_bank_account CHANGE COLUMN adresse_proprio owner_address text;
+alter table llx_societe_rib CHANGE COLUMN adresse_proprio owner_address text;
 
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0);
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index e58b0d42780..29e227f1cfa 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -45,7 +45,7 @@ class CompanyBankAccount extends Account
     var $iban;
     var $iban_prefix;		// deprecated
     var $proprio;
-    var $adresse_proprio;
+    var $owner_address;
 
     /**
 	 *  Constructor
@@ -124,7 +124,7 @@ class CompanyBankAccount extends Account
         $sql .= ",iban_prefix = '".$this->iban_prefix."'";
         $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
         $sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
-        $sql .= ",adresse_proprio = '".$this->db->escape($this->adresse_proprio)."'";
+        $sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
         $sql .= " WHERE fk_soc = ".$this->socid;
 
         $result = $this->db->query($sql);
@@ -150,7 +150,7 @@ class CompanyBankAccount extends Account
     {
         if (empty($id) && empty($socid)) return -1;
 
-        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, adresse_proprio";
+        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, owner_address";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
         if ($id)    $sql.= " WHERE rowid = ".$id;
         if ($socid) $sql.= " WHERE fk_soc  = ".$socid;
@@ -174,7 +174,7 @@ class CompanyBankAccount extends Account
                 $this->iban_prefix     = $obj->iban;	// deprecated
                 $this->domiciliation   = $obj->domiciliation;
                 $this->proprio         = $obj->proprio;
-                $this->adresse_proprio = $obj->adresse_proprio;
+                $this->owner_address   = $obj->owner_address;
             }
             $this->db->free($resql);