From c1d6ad90b33043f49e76bd329b711dfe3b73c50a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Jan 2017 12:35:19 +0100
Subject: [PATCH] FIX #6255
---
htdocs/compta/prelevement/create.php | 2 +-
htdocs/societe/rib.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index bcc6cc9450e..8a6f4bb7ecc 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -60,7 +60,6 @@ if ($action == 'modify')
}
if ($action == 'create')
{
-
// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
$bprev = new BonPrelevement($db);
$result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
@@ -73,6 +72,7 @@ if ($action == 'create')
$mesg='';
$mesg=$langs->trans("NoInvoiceCouldBeWithdrawed");
setEventMessages($mesg, null, 'errors');
+ $mesg.='<br>'."\n";
foreach($bprev->invoice_in_error as $key => $val)
{
$mesg.=$val."<br>\n";
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 8a6a9b87209..4d3e32e326f 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -376,7 +376,7 @@ if ($socid && $action != 'edit' && $action != "create")
$content = $account->code_guichet;
} elseif ($val == 'BankAccountNumber') {
$content = $account->number;
- if (! empty($account->label)) {
+ if (! empty($account->label) && $account->number) {
if (! checkBanForAccount($account)) {
$content.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
} else {
@@ -482,7 +482,7 @@ if ($socid && $action != 'edit' && $action != "create")
$string .= $rib->iban.' ';*/
}
}
- if (! empty($rib->label)) {
+ if (! empty($rib->label) && $rib->number) {
if (! checkBanForAccount($rib)) {
$string.= ' '.img_picto($langs->trans("ValueIsNotValid"),'warning');
} else {
--
GitLab