ibazn managment

This commit is contained in:
florian HENRY
2016-06-30 16:07:53 +02:00
parent 1e4916bd53
commit 12aee3e76c

View File

@@ -1376,22 +1376,26 @@ class Account extends CommonObject
$detailedBBAN = $this->useDetailedBBAN(); $detailedBBAN = $this->useDetailedBBAN();
if ($detailedBBAN == 0) { if ($detailedBBAN == 0) {
return array( $fieldarray= array(
'IBAN',
'BIC',
'BankAccountNumber' 'BankAccountNumber'
); );
} elseif ($detailedBBAN == 2) { } elseif ($detailedBBAN == 2) {
return array( $fieldarray= array(
'IBAN',
'BIC',
'BankCode', 'BankCode',
'BankAccountNumber' 'BankAccountNumber'
); );
} else {
$fieldarray=self::getAccountNumberOrder();
}
if ($this->needIBAN()) {
$fieldarray[]='IBAN';
$fieldarray[]='BIC';
} }
//Get the order the properties are shown //Get the order the properties are shown
return self::getAccountNumberOrder(); return $fieldarray;
} }
/** /**
@@ -1409,8 +1413,6 @@ class Account extends CommonObject
global $conf; global $conf;
$fieldlists = array( $fieldlists = array(
'IBAN',
'BIC',
'BankCode', 'BankCode',
'DeskCode', 'DeskCode',
'BankAccountNumber', 'BankAccountNumber',
@@ -1421,8 +1423,6 @@ class Account extends CommonObject
if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION)) { if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION)) {
if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') { if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') {
$fieldlists = array( $fieldlists = array(
'IBAN',
'BIC',
'BankCode', 'BankCode',
'DeskCode', 'DeskCode',
'BankAccountNumberKey', 'BankAccountNumberKey',