Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

Conflicts: ChangeLog
Dolibarr · Sep 3, 2015 · b0f604d · b0f604d
2 parents de741e4 + bd38e2f
commit b0f604d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -23,6 +23,7 @@ FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts
 FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
 FIX [ bug #3431 ] Invoice bank account is not respected
+FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
 
 NEW: Created new ContratLigne::insert function
 

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
@@ -631,7 +631,8 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
 	if (! empty($account->iban))
 	{
-		$ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
+		//Remove whitespaces to ensure we are dealing with the format we expect
+		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
 		$ibanDisplay = "";
 
 		for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)