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

FIX: Too many information were hidden. A lot of users still need bank

Browse Source 
account on PDF.
This commit is contained in:
Laurent Destailleur 2015-11-14 14:55:14 +01:00
parent 93be4305c4
commit b75923871c
1 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,13 +565,19 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
$cury+=3; $cury+=3;
} }
/* if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN)) // Note that some countries still need bank number, BIC/IBAN not enought for them
if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8); {
// Note:
// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
// desk = code guichet (FR), used only when $usedetailedbban = 1
// number = account number
// key = check control key used only when $usedetailedbban = 1
if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
if ($usedetailedbban == 1) if ($usedetailedbban == 1)
{ {
$fieldstoshow=array('bank','desk','number','key'); $fieldstoshow=array('bank','desk','number','key');
if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number'); if ($conf->global->BANK_SHOW_ORDER_OPTION == 1) $fieldstoshow=array('bank','desk','key','number');
} }
else if ($usedetailedbban == 2) else if ($usedetailedbban == 2)
{ {
@ -585,51 +591,51 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
{ {
// Bank code // Bank code
$tmplength=18; $tmplength=18;
$pdf->SetXY($curx, $cury+5); $pdf->SetXY($curx, $cury+4);
$pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0);
$pdf->SetXY($curx, $cury+1); $pdf->SetXY($curx, $cury+1);
$curx+=$tmplength; $curx+=$tmplength;
$pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0);
if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+7);
} }
if ($val == 'desk') if ($val == 'desk')
{ {
// Desk // Desk
$tmplength=18; $tmplength=18;
$pdf->SetXY($curx, $cury+5); $pdf->SetXY($curx, $cury+4);
$pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0);
$pdf->SetXY($curx, $cury+1); $pdf->SetXY($curx, $cury+1);
$curx+=$tmplength; $curx+=$tmplength;
$pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0);
if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+7);
} }
if ($val == 'number') if ($val == 'number')
{ {
// Number // Number
$tmplength=24; $tmplength=24;
$pdf->SetXY($curx, $cury+5); $pdf->SetXY($curx, $cury+4);
$pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0);
$pdf->SetXY($curx, $cury+1); $pdf->SetXY($curx, $cury+1);
$curx+=$tmplength; $curx+=$tmplength;
$pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0);
if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+7);
} }
if ($val == 'key') if ($val == 'key')
{ {
// Key // Key
$tmplength=13; $tmplength=13;
$pdf->SetXY($curx, $cury+5); $pdf->SetXY($curx, $cury+4);
$pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); $pdf->SetFont('','',$default_font_size - 3);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0);
$pdf->SetXY($curx, $cury+1); $pdf->SetXY($curx, $cury+1);
$curx+=$tmplength; $curx+=$tmplength;
$pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); $pdf->SetFont('','B',$default_font_size - 4);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8); if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+7);
} }
} }
$curx=$savcurx; $curx=$savcurx;
$cury+=9; $cury+=8;
*/ }
} }
else else
{ {
@ -679,7 +685,8 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban)); $ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
$ibanDisplay = ""; $ibanDisplay = "";
for($i = 0; $i < dol_strlen($ibanDisplay_temp); $i++) $nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
for($i = 0; $i < $nbIbanDisplay_temp; $i++)
{ {
$ibanDisplay .= $ibanDisplay_temp[$i]; $ibanDisplay .= $ibanDisplay_temp[$i];
if($i%4 == 3 && $i > 0) $ibanDisplay .= " "; if($i%4 == 3 && $i > 0) $ibanDisplay .= " ";