ibazn managment

Dolibarr · Jun 30, 2016 · 12aee3e · 12aee3e
1 parent 1e4916b
commit 12aee3e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
@@ -1376,22 +1376,26 @@ public function getFieldsToShow()
 		$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 @@ public static function getAccountNumberOrder()
 		global $conf;
 
 		$fieldlists = array(
-				'IBAN',
-				'BIC',
 				'BankCode',
 				'DeskCode',
 				'BankAccountNumber',
@@ -1421,8 +1423,6 @@ public static function getAccountNumberOrder()
 			if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION)) {
 				if ($conf->global->BANK_SHOW_ORDER_OPTION == '1') {
 					$fieldlists = array(
-						'IBAN',
-						'BIC',
 						'BankCode',
 						'DeskCode',
 						'BankAccountNumberKey',