lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur 2015-09-03 17:05:02 +02:00
commit b0f604da14
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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 #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 #3426 ] Unable to create an invoice from a contract with extrafields
FIX [ bug #3431 ] Invoice bank account is not respected 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 NEW: Created new ContratLigne::insert function

3
htdocs/core/lib/pdf.lib.php
View File

@ -631,7 +631,8 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
if ($account->getCountryCode() == 'IN') $ibankey="IFSC"; if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
if (! empty($account->iban)) 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 = ""; $ibanDisplay = "";
for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++) for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)