forked from Wavyzz/dolibarr
Debug v22
This commit is contained in:
@@ -76,8 +76,6 @@ if (!$year_start) {
|
|||||||
*/
|
*/
|
||||||
$error = 0;
|
$error = 0;
|
||||||
|
|
||||||
$form = new Form($db);
|
|
||||||
|
|
||||||
// Get account information
|
// Get account information
|
||||||
$object = new Account($db);
|
$object = new Account($db);
|
||||||
if ($id > 0 && !preg_match('/,/', $id)) { // if for a particular account and not a list
|
if ($id > 0 && !preg_match('/,/', $id)) { // if for a particular account and not a list
|
||||||
@@ -186,7 +184,7 @@ if (!empty($id)) {
|
|||||||
print dol_get_fiche_end();
|
print dol_get_fiche_end();
|
||||||
|
|
||||||
$head = bank_report_prepare_head($object);
|
$head = bank_report_prepare_head($object);
|
||||||
print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), 0);
|
print dol_get_fiche_head($head, 'annual', $langs->trans("FinancialAccount"), -1);
|
||||||
|
|
||||||
// Affiche tableau
|
// Affiche tableau
|
||||||
print load_fiche_titre('', $link, '');
|
print load_fiche_titre('', $link, '');
|
||||||
@@ -194,16 +192,16 @@ print load_fiche_titre('', $link, '');
|
|||||||
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
|
||||||
print '<table class="noborder centpercent">';
|
print '<table class="noborder centpercent">';
|
||||||
|
|
||||||
print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
|
print '<tr class="liste_titre"><td class="liste_titre borderrightlight">'.$langs->trans("Month").'</td>';
|
||||||
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
||||||
print '<td align="center" width="20%" colspan="2" class="liste_titre borderrightlight">'.$annee.'</td>';
|
print '<td align="center" width="20%" colspan="2" class="liste_titre borderrightlight">'.$annee.'</td>';
|
||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre borderrightlight"> </td>';
|
||||||
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
||||||
print '<td class="liste_titre" align="center">'.$langs->trans("Debit").'</td><td class="liste_titre" align="center">'.$langs->trans("Credit").'</td>';
|
print '<td class="liste_titre center">'.$langs->trans("Debit").'</td><td class="liste_titre center borderrightlight">'.$langs->trans("Credit").'</td>';
|
||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
@@ -214,7 +212,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
|||||||
|
|
||||||
for ($mois = 1; $mois < 13; $mois++) {
|
for ($mois = 1; $mois < 13; $mois++) {
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
|
print '<td class="borderrightlight">'.dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
|
||||||
|
|
||||||
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
||||||
$case = sprintf("%04d-%02d", $annee, $mois);
|
$case = sprintf("%04d-%02d", $annee, $mois);
|
||||||
@@ -237,10 +235,10 @@ for ($mois = 1; $mois < 13; $mois++) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Total debit-credit
|
// Total debit-credit
|
||||||
print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
|
print '<tr class="liste_total"><td class="borderrightlight liste_total"><b>'.$langs->trans("Total")."</b></td>";
|
||||||
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
for ($annee = $year_start; $annee <= $year_end; $annee++) {
|
||||||
print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
|
print '<td class="right nowraponall liste_total"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
|
||||||
print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
|
print '<td class="right nowraponall liste_total borderrightlight"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
|
||||||
}
|
}
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user