diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 9f000786b7f..5d2bb71109b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -1060,19 +1060,19 @@ if ($action == 'create') {
// IBAN
print '
| '.$langs->trans("BankAccountDomiciliation").' | ';
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index f9df30c2f54..45ed0c4776f 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -35,8 +35,10 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
$langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
@@ -170,13 +172,14 @@ llxHeader('', $langs->trans('ListPayment'));
$form = new Form($db);
$formother = new FormOther($db);
+$accountstatic = new Account($db);
$companystatic = new Societe($db);
$paymentfournstatic = new PaiementFourn($db);
$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
$sql .= ', s.rowid as socid, s.nom as name, s.email';
$sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
-$sql .= ', ba.rowid as bid, ba.label';
+$sql .= ', ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal';
if (empty($user->rights->societe->client->voir)) {
$sql .= ', sc.fk_soc, sc.fk_user';
}
@@ -232,7 +235,8 @@ if ($search_all) {
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle, ba.rowid, ba.label';
+$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle,';
+$sql .= ' ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal';
if (empty($user->rights->societe->client->voir)) {
$sql .= ', sc.fk_soc, sc.fk_user';
}
@@ -533,11 +537,24 @@ while ($i < min($num, $limit)) {
}
}
- // Account
+ // Bank account
if (!empty($arrayfields['ba.label']['checked'])) {
print ' | ';
if ($objp->bid) {
- print ''.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'';
+ $accountstatic->id = $objp->bid;
+ $accountstatic->ref = $objp->bref;
+ $accountstatic->label = $objp->blabel;
+ $accountstatic->number = $objp->number;
+ $accountstatic->iban = $objp->iban_prefix;
+ $accountstatic->bic = $objp->bic;
+ $accountstatic->currency_code = $objp->currency_code;
+ $accountstatic->account_number = $objp->account_number;
+
+ $accountingjournal = new AccountingJournal($db);
+ $accountingjournal->fetch($objp->accountancy_journal);
+ $accountstatic->accountancy_journal = $accountingjournal->code;
+
+ print $accountstatic->getNomUrl(1);
} else {
print ' ';
}
|