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

Merge pull request #21803 from frederic34/ibanForHuman

Browse Source 
iban human readable
This commit is contained in:
Laurent Destailleur 2022-08-22 10:53:20 +02:00 committed by GitHub
commit 88e66ab39a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/card.php
View File

@ -751,7 +751,7 @@ if ($action == 'create') {
} }
print '<tr><td>'.$langs->trans($ibankey).'</td>'; print '<tr><td>'.$langs->trans($ibankey).'</td>';
print '<td>'.$object->iban.'&nbsp;'; print '<td>'.getIbanHumanReadable($object).'&nbsp;';
if (!empty($object->iban)) { if (!empty($object->iban)) {
if (!checkIbanForAccount($object)) { if (!checkIbanForAccount($object)) {
print img_picto($langs->trans("IbanNotValid"), 'warning'); print img_picto($langs->trans("IbanNotValid"), 'warning');

3
htdocs/compta/bank/class/account.class.php
View File

@ -1381,6 +1381,7 @@ class Account extends CommonObject
public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0) public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
{ {
global $conf, $langs, $user; global $conf, $langs, $user;
include_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
$result = ''; $result = '';
$label = img_picto('', $this->picto).' <u class="paddingrightnow">'.$langs->trans("BankAccount").'</u>'; $label = img_picto('', $this->picto).' <u class="paddingrightnow">'.$langs->trans("BankAccount").'</u>';
@ -1389,7 +1390,7 @@ class Account extends CommonObject
} }
$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label; $label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
$label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number; $label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number;
$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.$this->iban; $label .= '<br><b>'.$langs->trans('IBAN').':</b> '.getIbanHumanReadable($this);
$label .= '<br><b>'.$langs->trans('BIC').':</b> '.$this->bic; $label .= '<br><b>'.$langs->trans('BIC').':</b> '.$this->bic;
$label .= '<br><b>'.$langs->trans("AccountCurrency").':</b> '.$this->currency_code; $label .= '<br><b>'.$langs->trans("AccountCurrency").':</b> '.$this->currency_code;

18
htdocs/core/lib/bank.lib.php
View File

@ -290,6 +290,24 @@ function checkIbanForAccount(Account $account)
} }
} }
/**
* Returns the iban human readable
*
* @param Account $account Account object
* @return string
*/
function getIbanHumanReadable(Account $account)
{
if ($account->getCountryCode() == 'FR') {
require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
$ibantoprint = preg_replace('/[^a-zA-Z0-9]/', '', $account->iban);
$iban = new PHP_IBAN\IBAN($ibantoprint);
return $iban->HumanFormat();
}
return $account->iban;
}
/** /**
* Check account number informations for a bank account * Check account number informations for a bank account
* *