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

Merge pull request #21655 from rycks/14.0-add_account_number_on_invoices_for_debit

Browse Source 
NEW #21654: add bank account number used on invoices for debit
This commit is contained in:
Laurent Destailleur 2022-08-23 15:46:59 +02:00 committed by GitHub
commit 83ace0cb12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1163,6 +1163,14 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
$pdf->SetXY($posxval, $posy); $pdf->SetXY($posxval, $posy);
$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
//#21654: add account number used for the debit
if ($object->mode_reglement_code == "PRE") {
require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
$bac = new CompanyBankAccount($this->db);
$bac->fetch(0, $object->thirdparty->id);
$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
$lib_mode_reg .= $langs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
}
$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L'); $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
$posy = $pdf->GetY(); $posy = $pdf->GetY();

11
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1271,6 +1271,16 @@ class pdf_sponge extends ModelePDFFactures
$pdf->SetFont('', '', $default_font_size - 2); $pdf->SetFont('', '', $default_font_size - 2);
$pdf->SetXY($posxval, $posy); $pdf->SetXY($posxval, $posy);
$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement); $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
//#21654: add account number used for the debit
if ($object->mode_reglement_code == "PRE") {
require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
$bac = new CompanyBankAccount($this->db);
$bac->fetch(0, $object->thirdparty->id);
$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
$lib_mode_reg .= $langs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
}
$pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L'); $pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L');
$posy = $pdf->GetY(); $posy = $pdf->GetY();
@ -1291,6 +1301,7 @@ class pdf_sponge extends ModelePDFFactures
} }
} }
if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) { if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
global $langs; global $langs;

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

@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions
PaymentTypeVIR=Bank transfer PaymentTypeVIR=Bank transfer
PaymentTypeShortVIR=Bank transfer PaymentTypeShortVIR=Bank transfer
PaymentTypePRE=Direct debit payment order PaymentTypePRE=Direct debit payment order
PaymentTypePREdetails=(on account *-%s)
PaymentTypeShortPRE=Debit payment order PaymentTypeShortPRE=Debit payment order
PaymentTypeLIQ=Cash PaymentTypeLIQ=Cash
PaymentTypeShortLIQ=Cash PaymentTypeShortLIQ=Cash

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

@ -437,6 +437,7 @@ VarAmountAllLines=Montant variable (%% tot.) - toutes les lignes identiques
PaymentTypeVIR=Virement bancaire PaymentTypeVIR=Virement bancaire
PaymentTypeShortVIR=Virement bancaire PaymentTypeShortVIR=Virement bancaire
PaymentTypePRE=Ordre de prélèvement PaymentTypePRE=Ordre de prélèvement
PaymentTypePREdetails=(compte *-%s)
PaymentTypeShortPRE=Ordre de prélèvement PaymentTypeShortPRE=Ordre de prélèvement
PaymentTypeLIQ=Espèce PaymentTypeLIQ=Espèce
PaymentTypeShortLIQ=Espèce PaymentTypeShortLIQ=Espèce