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

FIx #yogosha5774

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-05 15:11:28 +02:00
parent 5769701cd0
commit 01eec2b919
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/admin/categories_list.php
View File

@ -787,7 +787,7 @@ if ($id) {
$class = 'tddict'; $class = 'tddict';
// Show value for field // Show value for field
if ($showfield) { if ($showfield) {
print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>'; print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.dol_escape_htmltag($valuetoshow).'</td>';
} }
} }
} }

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

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2016-2017 Jamal Elbaz <jamelbaz@gmail.com> /* Copyright (C) 2016-2017 Jamal Elbaz <jamelbaz@gmail.com>
* Copyright (C) 2016 Alexandre Spangaro <aspangaro@open-dsi.fr> * Copyright (C) 2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018 Laurent Destailleur <eldy@destailleur.fr> * Copyright (C) 2018-2020 Laurent Destailleur <eldy@destailleur.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -318,9 +318,9 @@ if ($modecompta == 'CREANCES-DETTES') {
// Year NP // Year NP
print '<td class="liste_total width200">'; print '<td class="liste_total width200">';
print $cat['code']; print dol_escape_htmltag($cat['code']);
print '</td><td>'; print '</td><td>';
print $cat['label']; print dol_escape_htmltag($cat['label']);
print '</td>'; print '</td>';
$vars = array(); $vars = array();
@ -337,7 +337,7 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1); $r = dol_eval($result, 1);
//var_dump($r); //var_dump($r);
print '<td class="liste_total right">'.price($r).'</td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
// Year N // Year N
$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...) $code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
@ -355,7 +355,7 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result); //$r = $AccCat->calculate($result);
$r = dol_eval($result, 1); $r = dol_eval($result, 1);
print '<td class="liste_total right">'.price($r).'</td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['N'] += $r; $sommes[$code]['N'] += $r;
// Detail by month // Detail by month
@ -369,7 +369,7 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result); //$r = $AccCat->calculate($result);
$r = dol_eval($result, 1); $r = dol_eval($result, 1);
print '<td class="liste_total right">'.price($r).'</td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r; $sommes[$code]['M'][$k] += $r;
} }
} }
@ -383,7 +383,7 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result); //$r = $AccCat->calculate($result);
$r = dol_eval($result, 1); $r = dol_eval($result, 1);
print '<td class="liste_total right">'.price($r).'</td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r; $sommes[$code]['M'][$k] += $r;
} }
} }
@ -471,12 +471,12 @@ if ($modecompta == 'CREANCES-DETTES') {
// Column group // Column group
print '<td class="width200">'; print '<td class="width200">';
print $cat['code']; print dol_escape_htmltag($cat['code']);
print '</td>'; print '</td>';
// Label of group // Label of group
print '<td>'; print '<td>';
print $cat['label']; print dol_escape_htmltag($cat['label']);
if (count($cpts) > 0) { // Show example of 5 first accounting accounts if (count($cpts) > 0) { // Show example of 5 first accounting accounts
$i = 0; $i = 0;
foreach ($cpts as $cpt) { foreach ($cpts as $cpt) {
@ -489,7 +489,7 @@ if ($modecompta == 'CREANCES-DETTES') {
} else { } else {
print ' ('; print ' (';
} }
print $cpt['account_number']; print dol_escape_htmltag($cpt['account_number']);
$i++; $i++;
} }
if ($i <= 5) { if ($i <= 5) {