From 9547530c4d2a15c1d058080a8c194ba1c0a49320 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 24 Nov 2008 19:43:21 +0000
Subject: [PATCH] Support internationnal BBAN (Basic Bank Account Number)

---
 htdocs/langs/en_US/bills.lang |  3 ++-
 htdocs/langs/es_ES/bills.lang |  3 ++-
 htdocs/langs/fr_FR/bills.lang |  3 ++-
 htdocs/langs/it_IT/bills.lang |  5 +++--
 htdocs/langs/nl_BE/bills.lang |  3 ++-
 htdocs/lib/company.lib.php    | 16 +++++++---------
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 8f74302a288..29a2078a577 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -279,9 +279,10 @@ DeskCode=Desk code
 BankAccountNumber=Account number
 BankAccountNumberKey=Key
 Residence=Domiciliation
-IbanPrefix=IBAN number
+IBANNumber=IBAN number
 IBAN=IBAN
 BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT number
 ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Cheque N°
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 381dd64dc79..e0f30086e80 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -297,9 +297,10 @@ DeskCode=C
 BankAccountNumber=Número cuenta
 BankAccountNumberKey=Llave RIB
 Residence=Domiciliación
-IbanPrefix=Prefijo IBAN
+IBANNumber=IBAN
 IBAN=IBAN
 BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT
 ExtraInfos=Informaciones complementarias
 RegulatedOn=Pagar el
 ChequeNumber=Cheque nº
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index b5761ea0a66..be763c0823f 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -280,9 +280,10 @@ DeskCode=Code guichet
 BankAccountNumber=Numéro compte
 BankAccountNumberKey=Clé RIB
 Residence=Domiciliation
-IbanPrefix=Prefix IBAN
+IBANNumber=Code IBAN
 IBAN=IBAN
 BIC=BIC/SWIFT
+BICNumber=Code BIC/SWIFT
 ExtraInfos=Informations complémentaires
 RegulatedOn=Réglé le
 ChequeNumber=Chèque N°
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 38ac6e80fad..e6b28653028 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -273,9 +273,10 @@ DeskCode							   =Codice sportello
 BankAccountNumber						   =Numero di conto
 BankAccountNumberKey						   =Chiave
 Residence							   =Domiciliazione
-IbanPrefix							   =Codice IBAN
+IBANNumber                             =Codice IBAN
 IBAN								   =IBAN
-BIC								   =BIC/SWIFT
+BIC								       =BIC/SWIFT
+BICNumber                              =Codice BIC/SWIFT
 ExtraInfos							   =Extra info
 RegulatedOn							   =Regolamentato su
 ChequeNumber							   =Assegno N°
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 12b8faad7d3..c8dcb1c192c 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -221,9 +221,10 @@ DeskCode=Desk code
 BankAccountNumber=Account nummer
 BankAccountNumberKey=Key
 Residence=Domiciliation
-IbanPrefix=IBAN nummer
+IBANNumber=IBAN nummer
 IBAN=IBAN
 BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT nummer
 ExtraInfos=Extra info
 RegulatedOn=Regulariseerd op
 ChequeNumber=Cheque N°
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 70bf382ffe1..d0c94868a13 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -684,16 +684,14 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
  */
 function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
 {
-	global $mysoc,$conf;
-	
 	$pdf->SetXY ($curx, $cury);
 	$pdf->SetFont('Arial','B',8);
 	$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
 	$cury+=4;
 	
-	// TODO We use country of company, but we should use country of bank account.
-	if (empty($conf->global->FACTURE_SHOW_BANK_NUMBER_ONLY)
-		|| $mysoc->pays_code == 'FR')
+	$country_code=$account->getCountryCode();
+	
+	if ($country_code == 'FR')
 	{
 		$pdf->SetFont('Arial','B',6);
 		$pdf->line($curx+1, $cury, $curx+1, $cury+10 );
@@ -724,16 +722,16 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
 	{
 		$pdf->SetFont('Arial','B',6);
 		$pdf->SetXY ($curx, $cury);
-		$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BankAccountNumber").' : ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+		$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
 		$cury-=9;
 	}
 		
 	$pdf->SetXY ($curx, $cury+12);
-	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
+	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
 	$pdf->SetXY ($curx, $cury+22);
-	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0);
+	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("IBANNumber").': ' . $outputlangs->convToOutputCharset($account->iban), 0, 'L', 0);
 	$pdf->SetXY ($curx, $cury+25);
-	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+	$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BICNumber").': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
 
 	return $pdf->getY();
 }