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

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-29 18:11:57 +01:00
parent f7f140f003
commit f4476b905c
1 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,60 +339,81 @@ if ($modecompta == 'CREANCES-DETTES') {
} }
$result = strtr($formula, $vars); $result = strtr($formula, $vars);
$result = str_replace('--', '+', $result);
//var_dump($result); if (preg_match('/[a-z]/i', $result)) {
//$r = $AccCat->calculate($result); $r = 'Error bad formula: '.$result;
$r = dol_eval($result, 1, 1, '1'); $rshort = 'Err';
//var_dump($r); print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>'; // Detail by month
foreach ($months as $k => $v) {
// Year N if (($k + 1) >= $date_startmonth) {
$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...) print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
$sommes[$code]['NP'] += $r;
// Current fiscal year (N)
if (is_array($sommes) && !empty($sommes)) {
foreach ($sommes as $code => $det) {
$vars[$code] = $det['N'];
}
}
$result = strtr($formula, $vars);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['N'] += $r;
// Detail by month
foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) {
foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k];
} }
$result = strtr($formula, $vars);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r;
} }
} foreach ($months as $k => $v) {
foreach ($months as $k => $v) { if (($k + 1) < $date_startmonth) {
if (($k + 1) < $date_startmonth) { print '<td class="liste_total right"><span class="amount" title="'.dol_escape_htmltag($r).'">'.$rshort.'</span></td>';
foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k];
} }
$result = strtr($formula, $vars); }
} else {
//var_dump($result);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, '1');
//var_dump($r);
//$r = $AccCat->calculate($result); print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>'; // Year N
$sommes[$code]['M'][$k] += $r; $code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
$sommes[$code]['NP'] += $r;
// Current fiscal year (N)
if (is_array($sommes) && !empty($sommes)) {
foreach ($sommes as $code => $det) {
$vars[$code] = $det['N'];
}
}
$result = strtr($formula, $vars);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['N'] += $r;
// Detail by month
foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) {
foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k];
}
$result = strtr($formula, $vars);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r;
}
}
foreach ($months as $k => $v) {
if (($k + 1) < $date_startmonth) {
foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k];
}
$result = strtr($formula, $vars);
//$r = $AccCat->calculate($result);
$r = dol_eval($result, 1, 1, 1);
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r;
}
} }
} }