Skip to content
Snippets Groups Projects
Commit ea7a2b1e authored by Alexandre SPANGARO's avatar Alexandre SPANGARO
Browse files

Fix : Bank account ref not show in accountancy journal. Complete informations for tooltip

parent b0ee04c0
No related branches found
No related tags found
No related merge requests found
<?php <?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com> /* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2013-2017 Alexandre Spangaro <aspangaro@zendsi.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
...@@ -121,7 +121,7 @@ dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron'); ...@@ -121,7 +121,7 @@ dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">' . $langs->trans('Journaux') . '</td>'; print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
print "</tr>\n"; print "</tr>\n";
foreach ( $list as $key ) { foreach ( $list as $key ) {
...@@ -145,11 +145,11 @@ print '<br>'; ...@@ -145,11 +145,11 @@ print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">' . $langs->trans('JournalFinancial') . ' ('.$langs->trans('Opened').')</td>'; print '<td colspan="2">' . $langs->trans('JournalFinancial') . ' ('.$langs->trans('Opened').')</td>';
print "</tr>\n"; print "</tr>\n";
// Bank account // Bank account
$sql = "SELECT rowid, label, number, accountancy_journal"; $sql = "SELECT rowid, ref, label, number, account_number, accountancy_journal";
$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account"; $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
$sql .= " WHERE entity = " . $conf->entity; $sql .= " WHERE entity = " . $conf->entity;
$sql .= " AND clos = 0"; $sql .= " AND clos = 0";
...@@ -169,9 +169,12 @@ if ($resql) { ...@@ -169,9 +169,12 @@ if ($resql) {
$var = ! $var; $var = ! $var;
$bankaccountstatic->rowid = $objp->rowid;
$bankaccountstatic->id = $objp->rowid; $bankaccountstatic->id = $objp->rowid;
$bankaccountstatic->ref = $objp->ref;
$bankaccountstatic->label = $objp->label; $bankaccountstatic->label = $objp->label;
$bankaccountstatic->number = $objp->number; $bankaccountstatic->number = $objp->number;
$bankaccountstatic->account_number = $objp->account_number;
$bankaccountstatic->accountancy_journal = $objp->accountancy_journal; $bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
print '<tr ' . $bc[$var] . ' class="value">'; print '<tr ' . $bc[$var] . ' class="value">';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment