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

Support internationnal BBAN (Basic Bank Account Number)

Browse Source
This commit is contained in:
Laurent Destailleur 2008-11-24 19:43:21 +00:00
parent 750e5a45c2
commit 9547530c4d
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/bills.lang
View File

@ -279,9 +279,10 @@ DeskCode=Desk code
BankAccountNumber=Account number BankAccountNumber=Account number
BankAccountNumberKey=Key BankAccountNumberKey=Key
Residence=Domiciliation Residence=Domiciliation
IbanPrefix=IBAN number IBANNumber=IBAN number
IBAN=IBAN IBAN=IBAN
BIC=BIC/SWIFT BIC=BIC/SWIFT
BICNumber=BIC/SWIFT number
ExtraInfos=Extra infos ExtraInfos=Extra infos
RegulatedOn=Regulated on RegulatedOn=Regulated on
ChequeNumber=Cheque N° ChequeNumber=Cheque N°

3
htdocs/langs/es_ES/bills.lang
View File

@ -297,9 +297,10 @@ DeskCode=C
BankAccountNumber=Número cuenta BankAccountNumber=Número cuenta
BankAccountNumberKey=Llave RIB BankAccountNumberKey=Llave RIB
Residence=Domiciliación Residence=Domiciliación
IbanPrefix=Prefijo IBAN IBANNumber=IBAN
IBAN=IBAN IBAN=IBAN
BIC=BIC/SWIFT BIC=BIC/SWIFT
BICNumber=BIC/SWIFT
ExtraInfos=Informaciones complementarias ExtraInfos=Informaciones complementarias
RegulatedOn=Pagar el RegulatedOn=Pagar el
ChequeNumber=Cheque nº ChequeNumber=Cheque nº

3
htdocs/langs/fr_FR/bills.lang
View File

@ -280,9 +280,10 @@ DeskCode=Code guichet
BankAccountNumber=Numéro compte BankAccountNumber=Numéro compte
BankAccountNumberKey=Clé RIB BankAccountNumberKey=Clé RIB
Residence=Domiciliation Residence=Domiciliation
IbanPrefix=Prefix IBAN IBANNumber=Code IBAN
IBAN=IBAN IBAN=IBAN
BIC=BIC/SWIFT BIC=BIC/SWIFT
BICNumber=Code BIC/SWIFT
ExtraInfos=Informations complémentaires ExtraInfos=Informations complémentaires
RegulatedOn=Réglé le RegulatedOn=Réglé le
ChequeNumber=Chèque N° ChequeNumber=Chèque N°

5
htdocs/langs/it_IT/bills.lang
View File

@ -273,9 +273,10 @@ DeskCode =Codice sportello
BankAccountNumber =Numero di conto BankAccountNumber =Numero di conto
BankAccountNumberKey =Chiave BankAccountNumberKey =Chiave
Residence =Domiciliazione Residence =Domiciliazione
IbanPrefix =Codice IBAN IBANNumber =Codice IBAN
IBAN =IBAN IBAN =IBAN
BIC =BIC/SWIFT BIC =BIC/SWIFT
BICNumber =Codice BIC/SWIFT
ExtraInfos =Extra info ExtraInfos =Extra info
RegulatedOn =Regolamentato su RegulatedOn =Regolamentato su
ChequeNumber =Assegno N° ChequeNumber =Assegno N°

3
htdocs/langs/nl_BE/bills.lang
View File

@ -221,9 +221,10 @@ DeskCode=Desk code
BankAccountNumber=Account nummer BankAccountNumber=Account nummer
BankAccountNumberKey=Key BankAccountNumberKey=Key
Residence=Domiciliation Residence=Domiciliation
IbanPrefix=IBAN nummer IBANNumber=IBAN nummer
IBAN=IBAN IBAN=IBAN
BIC=BIC/SWIFT BIC=BIC/SWIFT
BICNumber=BIC/SWIFT nummer
ExtraInfos=Extra info ExtraInfos=Extra info
RegulatedOn=Regulariseerd op RegulatedOn=Regulariseerd op
ChequeNumber=Cheque N° ChequeNumber=Cheque N°

16
htdocs/lib/company.lib.php
View File

@ -684,16 +684,14 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
*/ */
function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account) function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
{ {
global $mysoc,$conf;
$pdf->SetXY ($curx, $cury); $pdf->SetXY ($curx, $cury);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('Arial','B',8);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
$cury+=4; $cury+=4;
// TODO We use country of company, but we should use country of bank account. $country_code=$account->getCountryCode();
if (empty($conf->global->FACTURE_SHOW_BANK_NUMBER_ONLY)
|| $mysoc->pays_code == 'FR') if ($country_code == 'FR')
{ {
$pdf->SetFont('Arial','B',6); $pdf->SetFont('Arial','B',6);
$pdf->line($curx+1, $cury, $curx+1, $cury+10 ); $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->SetFont('Arial','B',6);
$pdf->SetXY ($curx, $cury); $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; $cury-=9;
} }
$pdf->SetXY ($curx, $cury+12); $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->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->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(); return $pdf->getY();
} }