Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX : No decimals in result.php (#29377)

Browse Source 
* FIX : No decimals in result.php

* FIX : PR returns
This commit is contained in:
atm-adrien 2024-04-22 16:29:02 +02:00 committed by GitHub
parent 04a8bc3f47
commit d663dc2ea4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,7 +354,11 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result);
$r = (float) dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="liste_total right"><span class="amount">'.price($r, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
}
}
if (!isset($sommes[$code])) {
@ -381,7 +385,11 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result);
$r = (float) dol_eval($result, 1, 1, '1');
print '<td class="liste_total right borderright"><span class="amount">'.price($r).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="liste_total right borderright"><span class="amount">'.price($r, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="liste_total right borderright"><span class="amount">'.price($r).'</span></td>';
}
if (empty($sommes[$code]['N'])) {
$sommes[$code]['N'] = $r;
} else {
@ -400,7 +408,12 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result);
$r = (float) dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="liste_total right"><span class="amount">'.price($r, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
}
if (empty($sommes[$code]['M'][$k])) {
$sommes[$code]['M'][$k] = $r;
} else {
@ -420,7 +433,11 @@ if ($modecompta == 'CREANCES-DETTES') {
//$r = $AccCat->calculate($result);
$r = (float) dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="liste_total right"><span class="amount">'.price($r, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
}
if (empty($sommes[$code]['M'][$k])) {
$sommes[$code]['M'][$k] = $r;
} else {
@ -581,18 +598,31 @@ if ($modecompta == 'CREANCES-DETTES') {
print $labeltoshow;
print '</td>';
print '<td class="right"><span class="amount">'.price($totCat['NP']).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($totCat['N']).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="right"><span class="amount">'.price($totCat['NP'], 0, '', 1, 0, 0).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($totCat['N'], 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="right"><span class="amount">'.price($totCat['NP']).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($totCat['N']).'</span></td>';
}
// Each month
foreach ($totCat['M'] as $k => $v) {
if (($k + 1) >= $date_startmonth && $k < $date_endmonth) {
print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="right nowraponall"><span class="amount">'.price($v, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
}
}
}
foreach ($totCat['M'] as $k => $v) {
if (($k + 1) < $date_startmonth) {
print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="right nowraponall"><span class="amount">'.price($v, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="right nowraponall"><span class="amount">'.price($v).'</span></td>';
}
}
}
@ -622,8 +652,13 @@ if ($modecompta == 'CREANCES-DETTES') {
print '<td class="tdoverflowmax250 borderright" title="'.dol_escape_htmltag($labeldetail).'">';
print dol_escape_htmltag($labeldetail);
print '</td>';
print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($resultN).'</span></td>';
if (getDolGlobalInt('ACCOUNTANCY_TRUNC_DECIMAL_ON_BALANCE_REPORT')) {
print '<td class="right"><span class="amount">'.price($resultNP, 0, '', 1, 0, 0).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($resultN, 0, '', 1, 0, 0).'</span></td>';
} else {
print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>';
print '<td class="right borderright"><span class="amount">'.price($resultN).'</span></td>';
}
// Make one call for each month
foreach ($months as $k => $v) {