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

New: Bank name in PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-17 21:19:00 +00:00
parent b15efe5434
commit 815e84404c
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -35,6 +35,7 @@ For users:
- New: Works even if Web hosting provider has disabled glob function.
- New: Can now send supplier order by mail.
- New: task #10076 : Show content of message in notification module.
- New: Bank name available on invoice.
- Fix: Debug experimental module widthrawal.
- Fix: Format number was wrong for ar_AR language.
- Fix: Can change password if has only permission change password.

2
htdocs/compta/bank/bankid_fr.php
View File

@ -296,7 +296,7 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
print '<td colspan="3"><input size="26" type="text" class="flat" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="26" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
print '<td colspan="3"><input size="12" maxlength="11" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";

5
htdocs/compta/bank/class/account.class.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
*
@ -21,7 +21,7 @@
*/
/**
* \file htdocs/compta/bank/account.class.php
* \file htdocs/compta/bank/class/account.class.php
* \ingroup banque
* \brief Fichier de la classe des comptes bancaires
* \version $Id$
@ -45,6 +45,7 @@ class Account extends CommonObject
var $ref;
var $label;
var $type; // 'payment', 'company', 'member', 'banktransfert', 'payment_supplier', 'sc', 'payment_vat', ...
//! Name
var $bank;
var $clos;
var $rappro;

31
htdocs/lib/pdf.lib.php
View File

@ -127,24 +127,31 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
$cury+=4;
$outputlangs->load("banks");
$usedetailedbban=$account->useDetailedBBAN();
if ($usedetailedbban)
{
$pdf->SetFont('Arial','B',6);
$pdf->line($curx+1, $cury, $curx+1, $cury+10 );
$pdf->SetFont('Arial','',6);
$pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
$cury+=3;
$pdf->SetFont('Arial','B',6);
$pdf->line($curx+1, $cury+1, $curx+1, $cury+10 );
$pdf->SetXY ($curx, $cury+1);
$pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0);
$pdf->line($curx+18, $cury, $curx+18, $cury+10 );
$pdf->SetXY ($curx+18, $cury);
$pdf->line($curx+18, $cury+1, $curx+18, $cury+10 );
$pdf->SetXY ($curx+18, $cury+1);
$pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0);
$pdf->line($curx+36, $cury, $curx+36, $cury+10 );
$pdf->SetXY ($curx+36, $cury);
$pdf->line($curx+36, $cury+1, $curx+36, $cury+10 );
$pdf->SetXY ($curx+36, $cury+1);
$pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0);
$pdf->line($curx+60, $cury, $curx+60, $cury+10 );
$pdf->SetXY ($curx+60, $cury);
$pdf->line($curx+60, $cury+1, $curx+60, $cury+10 );
$pdf->SetXY ($curx+60, $cury+1);
$pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
$pdf->line($curx+73, $cury, $curx+73, $cury+10 );
$pdf->line($curx+73, $cury+1, $curx+73, $cury+10 );
$pdf->SetFont('Arial','',8);
$pdf->SetXY ($curx, $cury+6);
@ -158,12 +165,18 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
}
else
{
$pdf->SetFont('Arial','B',6);
$pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
$cury+=3;
$pdf->SetFont('Arial','B',6);
$pdf->SetXY ($curx, $cury);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
$cury-=9;
}
$pdf->SetFont('Arial','',6);
$pdf->SetXY ($curx, $cury+12);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
$pdf->SetXY ($curx, $cury+22);