From 67cf3cb99b203c0e01444f6870f74e18418387a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 Dec 2014 10:13:44 +0100
Subject: [PATCH] Fixed: BIC/SWIFT and IBAN must be at same level
---
htdocs/core/lib/pdf.lib.php | 56 ++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 15cb2f87b0b..bf2e5f2c218 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -492,7 +492,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
* @param int $curx X
* @param int $cury Y
* @param Account $account Bank account object
- * @param int $onlynumber Output only number
+ * @param int $onlynumber Output only number (bank+desk+key+number according to country, but without name of bank and domiciliation)
* @param int $default_font_size Default font size
* @return float The Y PDF position
*/
@@ -513,10 +513,14 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
$outputlangs->load("banks");
+ // Use correct name of bank id according to country
+ $bickey="BICNumber";
+ if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
// Get format of bank account according to its country
$usedetailedbban=$account->useDetailedBBAN();
- //$onlynumber=0; $usedetailedbban=0; // For tests
+ $onlynumber=0; $usedetailedbban=1; // For tests
if ($usedetailedbban)
{
$savcurx=$curx;
@@ -529,27 +533,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
$cury+=3;
}
- // Use correct name of bank id according to country
- $ibankey="IBANNumber";
- if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
- if (! empty($account->iban))
- {
- $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
- $ibanDisplay = "";
-
- for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++){
- $ibanDisplay .= $ibanDisplay_temp[$i];
- if($i%4 == 3 && $i > 0){
- $ibanDisplay .= " ";
- }
- }
-
- $pdf->SetFont('','B',$default_font_size - 3);
- $pdf->SetXY($curx, $cury);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
- $cury+=3;
- }
-
if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8);
if ($usedetailedbban == 1)
@@ -612,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
}
$curx=$savcurx;
- $cury+=10;
+ $cury+=9;
}
else
{
@@ -629,10 +612,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
if ($diffsizecontent <= 2) $cury+=1;
}
- // Use correct name of bank id according to country
- $bickey="BICNumber";
- if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
$pdf->SetFont('','',$default_font_size - $diffsizecontent);
if (empty($onlynumber) && ! empty($account->domiciliation))
@@ -647,8 +626,29 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
}
else if (! $usedetailedbban) $cury+=1;
+ // Use correct name of bank id according to country
+ $ibankey="IBANNumber";
+ if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
+ if (! empty($account->iban))
+ {
+ $ibanDisplay_temp = $outputlangs->convToOutputCharset($account->iban);
+ $ibanDisplay = "";
+
+ for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++)
+ {
+ $ibanDisplay .= $ibanDisplay_temp[$i];
+ if($i%4 == 3 && $i > 0) $ibanDisplay .= " ";
+ }
+
+ $pdf->SetFont('','B',$default_font_size - 3);
+ $pdf->SetXY($curx, $cury);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+ $cury+=3;
+ }
+
if (! empty($account->bic))
{
+ $pdf->SetFont('','B',$default_font_size - 3);
$pdf->SetXY($curx, $cury);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
}
--
GitLab