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

new #21654: add bank account number used on invoices for debit

Browse Source
This commit is contained in:
Eric Seigne 2022-08-04 09:49:44 +02:00
parent f93a4ce0c0
commit 6e6982d365
4 changed files with 19 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

@ -1089,6 +1089,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');
// Show online payment link // Show online payment link

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

@ -1174,6 +1174,14 @@ 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(80, 5, $lib_mode_reg, 0, 'L'); $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
// Show online payment link // Show online payment link

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

@ -426,6 +426,7 @@ VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
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
@ -593,4 +594,4 @@ FacParentLine=Invoice Line Parent
SituationTotalRayToRest=Remainder to pay without taxe SituationTotalRayToRest=Remainder to pay without taxe
PDFSituationTitle=Situation n° %d PDFSituationTitle=Situation n° %d
SituationTotalProgress=Total progress %d %% SituationTotalProgress=Total progress %d %%
SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s

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

@ -434,6 +434,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