diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index ef4eaefe9c2..e50a1a74a1b 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -73,5 +73,9 @@ else
 	dol_print_error($db,'Error');
 	$found = 'Error';
 }
+//Greek to Latin
+$greek = array('α','β','γ','δ','ε','ζ','η','θ','ι','κ','λ','μ','ν','ξ','ο','π','ρ','ς','σ','τ','υ','φ','χ','ψ','ω','Α','Β','Γ','Δ','Ε','Ζ','Η','Θ','Ι','Κ','Λ','Μ','Ν','Ξ','Ο','Π','Ρ','Σ','Τ','Υ','Φ','Χ','Ψ','Ω','ά','έ','ή','ί','ό','ύ','ώ','ϊ','ΐ','Ά','Έ','Ή','Ί','Ό','Ύ','Ώ','Ϊ');
 
-echo $found;
+$latin = array('a','b','g','d','e','z','h','th','i','k','l','m','n','ks','o','p','r','s','s','t','u','f','ch','ps','w','A','B','G','D','E','Z','H','TH','I','K','L','M','N','KS','O','P','R','S','T','U','F','CH','PS','W','a','e','h','i','o','u','w','i','i','A','E','H','I','O','U','W','I');
+
+print str_replace($greek, $latin, $found);
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index deed3b1b97a..9a04a431ac6 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -952,7 +952,7 @@ if ($id > 0 || ! empty($ref))
 			if ($sep > 0) print ' ';	// If we had at least one line in future
 			else print $langs->trans("CurrentBalance");
 			print ' '.$object->currency_code.'</td>';
-			print '<td align="right" class="nowrap"><b>'.price($solde, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
+			print '<td align="right" class="nowrap"><b>'.price($total, 0, $langs, 0, 0, -1, $object->currency_code).'</b></td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		} else {
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7ca7627333d..72ccaaf6d06 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -437,10 +437,11 @@ abstract class CommonObject
     /**
      * 	Return full address of contact
      *
-     * 	@param		Societe		$object				Object Societe or null
+     * 	@param		string		$htmlkey            HTML id to make banner content unique
+     *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)
      *	@return		string							Full address string
      */
-    function getBannerAddress($htmlkey, $object=null)
+    function getBannerAddress($htmlkey, $object)
     {
     	global $conf, $langs;
 
@@ -475,7 +476,7 @@ abstract class CommonObject
 			$outdone++;
 		}
 		
-		if (! in_array($object->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
+		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
 				&& ! empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) 
 		{
 			$out.=($outdone?'<br>':'').$this->state;