From 12aee3e76cdfa8d594bdc9596e7203c543f5904c Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consulting.fr>
Date: Thu, 30 Jun 2016 16:07:53 +0200
Subject: [PATCH] ibazn managment
---
htdocs/compta/bank/class/account.class.php | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0413692beac..68db9aba5e0 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1376,22 +1376,26 @@ class Account extends CommonObject
$detailedBBAN = $this->useDetailedBBAN();
if ($detailedBBAN == 0) {
- return array(
- 'IBAN',
- 'BIC',
+ $fieldarray= array(
'BankAccountNumber'
);
} elseif ($detailedBBAN == 2) {
- return array(
- 'IBAN',
- 'BIC',
+ $fieldarray= array(
'BankCode',
'BankAccountNumber'
);
+ } else {
+ $fieldarray=self::getAccountNumberOrder();
+ }
+
+ if ($this->needIBAN()) {
+ $fieldarray[]='IBAN';
+ $fieldarray[]='BIC';
}
//Get the order the properties are shown
- return self::getAccountNumberOrder();
+ return $fieldarray;
+
}
/**
@@ -1409,8 +1413,6 @@ class Account extends CommonObject
global $conf;
$fieldlists = array(
- 'IBAN',
- 'BIC',
'BankCode',
'DeskCode',
'BankAccountNumber',
@@ -1421,8 +1423,6 @@ class Account extends CommonObject
if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION)) {
if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') {
$fieldlists = array(
- 'IBAN',
- 'BIC',
'BankCode',
'DeskCode',
'BankAccountNumberKey',
--
GitLab