diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index a6bc41734d4..80055b20d72 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -1,6 +1,6 @@ - * Copyright (C) 2010-2015 Laurent Destailleur + * Copyright (C) 2010-2020 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent * Copyright (C) 2018 Nicolas ZABOURI @@ -120,7 +120,11 @@ if (empty($reshook)) $form = new Form($db); $thirdpartystatic = new Societe($db); -$invoicestatic = new Facture($db); +if ($type != 'bank-transfer') { + $invoicestatic = new Facture($db); +} else { + $invoicestatic = new FactureFournisseur($db); +} $bprev = new BonPrelevement($db); llxHeader('', $langs->trans("NewStandingOrder")); @@ -183,6 +187,7 @@ print '
'."\n"; print '
'; print ''; +print ''; if ($nb) { if ($pricetowithdraw) { print $langs->trans('ExecutionDate').' '; @@ -190,8 +195,13 @@ if ($nb) { if ($mysoc->isInEEC()) { $title = $langs->trans("CreateForSepa"); + if ($type == 'bank-transfer') { + $title = $langs->trans("CreateSepaFileForPaymentByBankTransfer"); + } - print ''; + if ($type != 'bank-transfer') { + print ''; + } print ''; } else { $title = $langs->trans("CreateAll"); @@ -363,7 +373,9 @@ if ($resql) print ''; print $thirdpartystatic->display_rib('rum'); $format = $thirdpartystatic->display_rib('format'); - if ($format) print ' ('.$format.')'; + if ($type != 'bank-transfer') { + if ($format) print ' ('.$format.')'; + } print ''; // Amount print ''; diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 1f9c91719da..df8aada28dc 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -10,8 +10,8 @@ PaymentByBankTransferReceipts=Credit transfer orders PaymentByBankTransferLines=Credit transfer order lines WithdrawalsReceipts=Direct debit orders WithdrawalReceipt=Direct debit order -BankTransferReceipts=Credit transfer receipts -BankTransferReceipt=Credit transfer receipt +BankTransferReceipts=Credit transfer order +BankTransferReceipt=Credit transfer order LatestBankTransferReceipts=Latest %s credit transfer orders LastWithdrawalReceipts=Latest %s direct debit files WithdrawalsLine=Direct debit order line