lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update with html5 compliant code

Browse Source
This commit is contained in:
Philippe GRAND 2019-02-12 14:44:25 +01:00
parent 8a62c9bc5f
commit e10d1eb365
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/resultat/index.php
View File

@ -922,7 +922,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
if($mois>12) {$annee_decalage=$annee+1;} if($mois>12) {$annee_decalage=$annee+1;}
$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage)); $case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
print '<td align="right">&nbsp;'; print '<td class="right">&nbsp;';
if ($modecompta == 'BOOKKEEPING') if ($modecompta == 'BOOKKEEPING')
{ {
if (isset($decaiss[$case]) && $decaiss[$case] != 0) if (isset($decaiss[$case]) && $decaiss[$case] != 0)
@ -943,7 +943,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
} }
print "</td>"; print "</td>";
print '<td align="right" class="borderrightlight">&nbsp;'; print '<td class="borderrightlight right">&nbsp;';
if ($modecompta == 'BOOKKEEPING') if ($modecompta == 'BOOKKEEPING')
{ {
if (isset($encaiss[$case])) if (isset($encaiss[$case]))
@ -978,8 +978,8 @@ print '</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++) for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{ {
$nbcols+=2; $nbcols+=2;
print '<td align="right">'.(isset($totsorties[$annee])?price(price2num($totsorties[$annee], 'MT')):'&nbsp;').'</td>'; print '<td class="right">'.(isset($totsorties[$annee])?price(price2num($totsorties[$annee], 'MT')):'&nbsp;').'</td>';
print '<td align="right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee], 'MT')):'&nbsp;').'</td>'; print '<td class="right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee], 'MT')):'&nbsp;').'</td>';
} }
print "</tr>\n"; print "</tr>\n";
@ -993,7 +993,7 @@ print "</tr>\n";
print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>'; print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>';
for ($annee = $year_start ; $annee <= $year_end ; $annee++) for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{ {
print '<td align="right" colspan="2" class="borderrightlight"> '; print '<td colspan="2" class="borderrightlight right"> ';
if (isset($totentrees[$annee]) || isset($totsorties[$annee])) if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
{ {
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0); $in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);

24
htdocs/compta/resultat/result.php
View File

@ -228,18 +228,18 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"")
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<th class="liste_titre">'.$langs->trans("AccountingCategory").'</th>'; print '<th class="liste_titre">'.$langs->trans("AccountingCategory").'</th>';
print '<th class="liste_titre"></th>'; print '<th class="liste_titre"></th>';
print '<th class="liste_titre" align="right">'.$langs->trans("PreviousPeriod").'</th>'; print '<th class="liste_titre right">'.$langs->trans("PreviousPeriod").'</th>';
print '<th class="liste_titre" align="right">'.$langs->trans("SelectedPeriod").'</th>'; print '<th class="liste_titre right">'.$langs->trans("SelectedPeriod").'</th>';
foreach($months as $k => $v){ foreach($months as $k => $v){
if (($k+1) >= $date_startmonth) if (($k+1) >= $date_startmonth)
{ {
print '<th class="liste_titre width50" align="right" >'.$langs->trans('MonthShort'.sprintf("%02s", ($k+1))).'</th>'; print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k+1))).'</th>';
} }
} }
foreach($months as $k => $v){ foreach($months as $k => $v){
if (($k+1) < $date_startmonth) if (($k+1) < $date_startmonth)
{ {
print '<th class="liste_titre width50" align="right" >'.$langs->trans('MonthShort'.sprintf("%02s", ($k+1))).'</th>'; print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k+1))).'</th>';
} }
} }
print '</tr>'; print '</tr>';
@ -493,15 +493,15 @@ elseif ($modecompta=="BOOKKEEPING")
} }
print '</td>'; print '</td>';
print '<td align="right">' . price($totCat['NP']) . '</td>'; print '<td class="right">' . price($totCat['NP']) . '</td>';
print '<td align="right">' . price($totCat['N']) . '</td>'; print '<td class="right">' . price($totCat['N']) . '</td>';
// Each month // Each month
foreach($totCat['M'] as $k => $v){ foreach($totCat['M'] as $k => $v){
if (($k+1) >= $date_startmonth) print '<td align="right">' . price($v) . '</td>'; if (($k+1) >= $date_startmonth) print '<td class="right">' . price($v) . '</td>';
} }
foreach($totCat['M'] as $k => $v){ foreach($totCat['M'] as $k => $v){
if (($k+1) < $date_startmonth) print '<td align="right">' . price($v) . '</td>'; if (($k+1) < $date_startmonth) print '<td class="right">' . price($v) . '</td>';
} }
print "</tr>\n"; print "</tr>\n";
@ -523,8 +523,8 @@ elseif ($modecompta=="BOOKKEEPING")
print ' - '; print ' - ';
print $cpt['account_label']; print $cpt['account_label'];
print '</td>'; print '</td>';
print '<td align="right">' . price($resultNP) . '</td>'; print '<td class="right">' . price($resultNP) . '</td>';
print '<td align="right">' . price($resultN) . '</td>'; print '<td class="right">' . price($resultN) . '</td>';
// Make one call for each month // Make one call for each month
foreach($months as $k => $v) foreach($months as $k => $v)
@ -532,7 +532,7 @@ elseif ($modecompta=="BOOKKEEPING")
if (($k+1) >= $date_startmonth) if (($k+1) >= $date_startmonth)
{ {
$resultM=$totPerAccount[$cpt['account_number']]['M'][$k]; $resultM=$totPerAccount[$cpt['account_number']]['M'][$k];
print '<td align="right">' . price($resultM) . '</td>'; print '<td class="right">' . price($resultM) . '</td>';
} }
} }
foreach($months as $k => $v) foreach($months as $k => $v)
@ -540,7 +540,7 @@ elseif ($modecompta=="BOOKKEEPING")
if (($k+1) < $date_startmonth) if (($k+1) < $date_startmonth)
{ {
$resultM=$totPerAccount[$cpt['account_number']]['M'][$k]; $resultM=$totPerAccount[$cpt['account_number']]['M'][$k];
print '<td align="right">' . price($resultM) . '</td>'; print '<td class="right">' . price($resultM) . '</td>';
} }
} }
print "</tr>\n"; print "</tr>\n";