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

Fix warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-13 12:53:56 +01:00
parent 354b94abce
commit 2d3f7d949e
1 changed files with 97 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,7 @@ if ($modecompta == 'CREANCES-DETTES') {
// Previous Fiscal year (N-1) // Previous Fiscal year (N-1)
foreach ($sommes as $code => $det) { foreach ($sommes as $code => $det) {
$vars[$code] = $det['NP']; $vars[$code] = empty($det['NP']) ? 0 : $det['NP'];
} }
$result = strtr($formula, $vars); $result = strtr($formula, $vars);
@ -355,12 +355,16 @@ if ($modecompta == 'CREANCES-DETTES') {
// Year N // Year N
$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...) $code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
$sommes[$code]['NP'] += $r; if (empty($sommes[$code]['NP'])) {
$sommes[$code]['NP'] = $r;
} else {
$sommes[$code]['NP'] += $r;
}
// Current fiscal year (N) // Current fiscal year (N)
if (is_array($sommes) && !empty($sommes)) { if (is_array($sommes) && !empty($sommes)) {
foreach ($sommes as $code => $det) { foreach ($sommes as $code => $det) {
$vars[$code] = $det['N']; $vars[$code] = empty($det['N']) ? 0 : $det['N'];
} }
} }
@ -371,13 +375,17 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1, 1, '1'); $r = dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['N'] += $r; if (empty($sommes[$code]['N'])) {
$sommes[$code]['N'] = $r;
} else {
$sommes[$code]['N'] += $r;
}
// Detail by month // Detail by month
foreach ($months as $k => $v) { foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) { if (($k + 1) >= $date_startmonth) {
foreach ($sommes as $code => $det) { foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k]; $vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
} }
$result = strtr($formula, $vars); $result = strtr($formula, $vars);
$result = str_replace('--', '+', $result); $result = str_replace('--', '+', $result);
@ -386,14 +394,18 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1, 1, '1'); $r = dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r; if (empty($sommes[$code]['M'][$k])) {
$sommes[$code]['M'][$k] = $r;
} else {
$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) {
foreach ($sommes as $code => $det) { foreach ($sommes as $code => $det) {
$vars[$code] = $det['M'][$k]; $vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
} }
$result = strtr($formula, $vars); $result = strtr($formula, $vars);
$result = str_replace('--', '+', $result); $result = str_replace('--', '+', $result);
@ -402,7 +414,11 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1, 1, '1'); $r = dol_eval($result, 1, 1, '1');
print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>'; print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
$sommes[$code]['M'][$k] += $r; if (empty($sommes[$code]['M'][$k])) {
$sommes[$code]['M'][$k] = $r;
} else {
$sommes[$code]['M'][$k] += $r;
}
} }
} }
@ -429,14 +445,14 @@ if ($modecompta == 'CREANCES-DETTES') {
$arrayofaccountforfilter = array(); $arrayofaccountforfilter = array();
foreach ($cpts as $i => $cpt) { // Loop on each account. foreach ($cpts as $i => $cpt) { // Loop on each account.
if (!is_null($cpt['account_number'])) { if (isset($cpt['account_number'])) {
$arrayofaccountforfilter[] = $cpt['account_number']; $arrayofaccountforfilter[] = $cpt['account_number'];
} }
} }
// N-1 // N-1
if (!empty($arrayofaccountforfilter)) { if (!empty($arrayofaccountforfilter)) {
$return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cat['dc'] ? $cat['dc'] : 0); $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, empty($cat['dc']) ? 0 : $cat['dc']);
if ($return < 0) { if ($return < 0) {
setEventMessages(null, $AccCat->errors, 'errors'); setEventMessages(null, $AccCat->errors, 'errors');
$resultNP = 0; $resultNP = 0;
@ -444,8 +460,16 @@ if ($modecompta == 'CREANCES-DETTES') {
foreach ($cpts as $i => $cpt) { // Loop on each account found foreach ($cpts as $i => $cpt) { // Loop on each account found
$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']]; $resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
$totCat['NP'] += $resultNP; if (empty($totCat['NP'])) {
$sommes[$code]['NP'] += $resultNP; $totCat['NP'] = $resultNP;
} else {
$totCat['NP'] += $resultNP;
}
if (empty($sommes[$code]['NP'])) {
$sommes[$code]['NP'] = $resultNP;
} else {
$sommes[$code]['NP'] += $resultNP;
}
$totPerAccount[$cpt['account_number']]['NP'] = $resultNP; $totPerAccount[$cpt['account_number']]['NP'] = $resultNP;
} }
} }
@ -467,23 +491,47 @@ if ($modecompta == 'CREANCES-DETTES') {
} }
//var_dump($monthtoprocess.'_'.$yeartoprocess); //var_dump($monthtoprocess.'_'.$yeartoprocess);
$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc'] ? $cat['dc'] : 0, 'nofilter', $monthtoprocess, $yeartoprocess); if (isset($cpt['account_number'])) {
if ($return < 0) { $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, empty($cat['dc']) ? 0 : $cat['dc'], 'nofilter', $monthtoprocess, $yeartoprocess);
setEventMessages(null, $AccCat->errors, 'errors'); if ($return < 0) {
$resultM = 0; setEventMessages(null, $AccCat->errors, 'errors');
$resultM = 0;
} else {
$resultM = $AccCat->sdc;
}
} else { } else {
$resultM = $AccCat->sdc; $resultM = 0;
}
if (empty($totCat['M'][$k])) {
$totCat['M'][$k] = $resultM;
} else {
$totCat['M'][$k] += $resultM;
}
if (empty($sommes[$code]['M'][$k])) {
$sommes[$code]['M'][$k] = $resultM;
} else {
$sommes[$code]['M'][$k] += $resultM;
}
if (isset($cpt['account_number'])) {
$totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
} }
$totCat['M'][$k] += $resultM;
$sommes[$code]['M'][$k] += $resultM;
$totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
$resultN += $resultM; $resultN += $resultM;
} }
$totCat['N'] += $resultN; if (empty($totCat)) {
$sommes[$code]['N'] += $resultN; $totCat['N'] = $resultN;
$totPerAccount[$cpt['account_number']]['N'] = $resultN; } else {
$totCat['N'] += $resultN;
}
if (empty($sommes[$code]['N'])) {
$sommes[$code]['N'] = $resultN;
} else {
$sommes[$code]['N'] += $resultN;
}
if (isset($cpt['account_number'])) {
$totPerAccount[$cpt['account_number']]['N'] = $resultN;
}
} }
@ -543,16 +591,26 @@ if ($modecompta == 'CREANCES-DETTES') {
// Loop on detail of all accounts to output the detail // Loop on detail of all accounts to output the detail
if ($showaccountdetail != 'no') { if ($showaccountdetail != 'no') {
foreach ($cpts as $i => $cpt) { foreach ($cpts as $i => $cpt) {
$resultNP = $totPerAccount[$cpt['account_number']]['NP']; if (isset($cpt['account_number'])) {
$resultN = $totPerAccount[$cpt['account_number']]['N']; $resultNP = $totPerAccount[$cpt['account_number']]['NP'];
$resultN = $totPerAccount[$cpt['account_number']]['N'];
} else {
$resultNP = 0;
$resultN = 0;
}
if ($showaccountdetail == 'all' || $resultN != 0) { if ($showaccountdetail == 'all' || $resultN != 0) {
print '<tr>'; print '<tr>';
print '<td></td>'; print '<td></td>';
print '<td class="tdoverflowmax250">';
print ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']); if (isset($cpt['account_number'])) {
print ' - '; $labeldetail = ' &nbsp; &nbsp; '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'];
print $cpt['account_label']; } else {
$labeldetail = '-';
}
print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($labeldetail).'">';
print dol_escape_htmltag($labeldetail);
print '</td>'; print '</td>';
print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>'; print '<td class="right"><span class="amount">'.price($resultNP).'</span></td>';
print '<td class="right"><span class="amount">'.price($resultN).'</span></td>'; print '<td class="right"><span class="amount">'.price($resultN).'</span></td>';
@ -560,13 +618,21 @@ if ($modecompta == 'CREANCES-DETTES') {
// Make one call for each month // Make one call for each month
foreach ($months as $k => $v) { foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) { if (($k + 1) >= $date_startmonth) {
$resultM = $totPerAccount[$cpt['account_number']]['M'][$k]; if (isset($cpt['account_number'])) {
$resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
} else {
$resultM = 0;
}
print '<td class="right"><span class="amount">'.price($resultM).'</span></td>'; print '<td class="right"><span class="amount">'.price($resultM).'</span></td>';
} }
} }
foreach ($months as $k => $v) { foreach ($months as $k => $v) {
if (($k + 1) < $date_startmonth) { if (($k + 1) < $date_startmonth) {
$resultM = $totPerAccount[$cpt['account_number']]['M'][$k]; if (isset($cpt['account_number'])) {
$resultM = empty($totPerAccount[$cpt['account_number']]['M'][$k]) ? 0 : $totPerAccount[$cpt['account_number']]['M'][$k];
} else {
$resultM = 0;
}
print '<td class="right"><span class="amount">'.price($resultM).'</span></td>'; print '<td class="right"><span class="amount">'.price($resultM).'</span></td>';
} }
} }