diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3ba717f7a51..73cb5d3bf02 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -527,6 +527,14 @@ if ($action == 'create') {
print '
| ';
print '';
+ // IBAN
+ print '| '.$langs->trans($ibankey).' | ';
+ print ' |
';
+
+ // BIC
+ print '| '.$langs->trans($bickey).' | ';
+ print ' |
';
+
// Show fields of bank account
$sizecss = '';
foreach ($object->getFieldsToShow() as $val) {
@@ -559,13 +567,6 @@ if ($action == 'create') {
$bickey = "SWIFT";
}
- // IBAN
- print '| '.$langs->trans($ibankey).' | ';
- print ' |
';
-
- print '| '.$langs->trans($bickey).' | ';
- print ' |
';
-
if (isModEnabled('paymentbybanktransfer')) {
print '| '.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).' | ';
print '';
@@ -753,6 +754,38 @@ if ($action == 'create') {
print ' |
| '.$langs->trans("BankName").' | ';
print ''.$object->bank.' |
';
+ $ibankey = FormBank::getIBANLabel($object);
+ $bickey = "BICNumber";
+ if ($object->getCountryCode() == 'IN') {
+ $bickey = "SWIFT";
+ }
+
+ // IBAN
+ print '| '.$langs->trans($ibankey).' | ';
+ print ''.getIbanHumanReadable($object).' ';
+ if (!empty($object->iban)) {
+ if (!checkIbanForAccount($object)) {
+ print img_picto($langs->trans("IbanNotValid"), 'warning');
+ } else {
+ print img_picto($langs->trans("IbanValid"), 'info');
+ }
+ }
+ print ' |
';
+
+ // BIC
+ print '| '.$langs->trans($bickey).' | ';
+ print ''.$object->bic.' ';
+ if (!empty($object->bic)) {
+ if (!checkSwiftForAccount($object)) {
+ print img_picto($langs->trans("SwiftNotValid"), 'warning');
+ } else {
+ print img_picto($langs->trans("SwiftValid"), 'info');
+ }
+ }
+ print ' |
';
+
+ // TODO Add a link "Show more..." for all ohter informations.
+
// Show fields of bank account
foreach ($object->getFieldsToShow() as $val) {
$content = '';
@@ -771,34 +804,6 @@ if ($action == 'create') {
print '';
}
- $ibankey = FormBank::getIBANLabel($object);
- $bickey = "BICNumber";
- if ($object->getCountryCode() == 'IN') {
- $bickey = "SWIFT";
- }
-
- print '| '.$langs->trans($ibankey).' | ';
- print ''.getIbanHumanReadable($object).' ';
- if (!empty($object->iban)) {
- if (!checkIbanForAccount($object)) {
- print img_picto($langs->trans("IbanNotValid"), 'warning');
- } else {
- print img_picto($langs->trans("IbanValid"), 'info');
- }
- }
- print ' |
';
-
- print '| '.$langs->trans($bickey).' | ';
- print ''.$object->bic.' ';
- if (!empty($object->bic)) {
- if (!checkSwiftForAccount($object)) {
- print img_picto($langs->trans("SwiftNotValid"), 'warning');
- } else {
- print img_picto($langs->trans("SwiftValid"), 'info');
- }
- }
- print ' |
';
-
if (isModEnabled('prelevement')) {
print '| '.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').' | ';
print ''.$object->ics.' | ';
@@ -1080,6 +1085,20 @@ if ($action == 'create') {
print ' | ';
print '
';
+ $ibankey = FormBank::getIBANLabel($object);
+ $bickey = "BICNumber";
+ if ($object->getCountryCode() == 'IN') {
+ $bickey = "SWIFT";
+ }
+
+ // IBAN
+ print '| '.$langs->trans($ibankey).' | ';
+ print ' |
';
+
+ // BIC
+ print '| '.$langs->trans($bickey).' | ';
+ print ' |
';
+
// Show fields of bank account
foreach ($object->getFieldsToShow() as $val) {
$content = '';
@@ -1106,19 +1125,6 @@ if ($action == 'create') {
print '';
}
- $ibankey = FormBank::getIBANLabel($object);
- $bickey = "BICNumber";
- if ($object->getCountryCode() == 'IN') {
- $bickey = "SWIFT";
- }
-
- // IBAN
- print '| '.$langs->trans($ibankey).' | ';
- print ' |
';
-
- print '| '.$langs->trans($bickey).' | ';
- print ' |
';
-
if (isModEnabled('prelevement')) {
print '| '.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').' | ';
print ' |
';