'.$CrLf;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index fdbb6189c5c..e3f3e6beaf4 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -379,10 +379,15 @@ if ($resql)
// RUM
print '| ';
- print $thirdpartystatic->display_rib('rum');
- $format = $thirdpartystatic->display_rib('format');
- if ($type != 'bank-transfer') {
- if ($format) print ' ('.$format.')';
+ $rumtoshow = $thirdpartystatic->display_rib('rum');
+ if ($rumtoshow) {
+ print $rumtoshow;
+ $format = $thirdpartystatic->display_rib('format');
+ if ($type != 'bank-transfer') {
+ if ($format) print ' ('.$format.')';
+ }
+ } else {
+ print img_warning($langs->trans("NoBankAccount"));
}
print ' | ';
// Amount
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e3d6409ddd6..6c8ab008252 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2798,7 +2798,7 @@ class Societe extends CommonObject
* Return bank number property of thirdparty (label or rum)
*
* @param string $mode 'label' or 'rum' or 'format'
- * @return string Bank number
+ * @return string Bank label or RUM or '' if no bank account found
*/
public function display_rib($mode = 'label')
{
@@ -2808,27 +2808,31 @@ class Societe extends CommonObject
$bac = new CompanyBankAccount($this->db);
$bac->fetch(0, $this->id);
- if ($mode == 'label')
- {
- return $bac->getRibLabel(true);
- }
- elseif ($mode == 'rum')
- {
- if (empty($bac->rum))
+ if ($bac->id > 0) { // If a bank account has been found for company $this->id
+ if ($mode == 'label')
{
- require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
- $prelevement = new BonPrelevement($this->db);
- $bac->fetch_thirdparty();
- $bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+ return $bac->getRibLabel(true);
}
- return $bac->rum;
+ elseif ($mode == 'rum')
+ {
+ if (empty($bac->rum))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+ $prelevement = new BonPrelevement($this->db);
+ $bac->fetch_thirdparty();
+ $bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
+ }
+ return $bac->rum;
+ }
+ elseif ($mode == 'format')
+ {
+ return $bac->frstrecur;
+ } else {
+ return 'BadParameterToFunctionDisplayRib';
+ }
+ } else {
+ return '';
}
- elseif ($mode == 'format')
- {
- return $bac->frstrecur;
- }
-
- return 'BadParameterToFunctionDisplayRib';
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps