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

NEW: feature #18986

Browse Source
This commit is contained in:
Florian HENRY 2021-10-15 10:53:17 +02:00
parent 5f4410468d
commit ab9ba4e0a2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/project.lib.php
View File

@ -929,7 +929,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
} }
} }
if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0) if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0 || $total_budget_amount > 0)
&& $level <= 0) { && $level <= 0) {
print '<tr class="liste_total nodrag nodrop">'; print '<tr class="liste_total nodrag nodrop">';
print '<td class="liste_total">'.$langs->trans("Total").'</td>'; print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@ -1031,8 +1031,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
} }
if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) { if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
print '<td class="nowrap liste_total right">'; print '<td class="nowrap liste_total center">';
price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency); print price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
print '</td>'; print '</td>';
} }

12
htdocs/projet/tasks/list.php
View File

@ -766,15 +766,17 @@ if (!empty($arrayfields['t.progress']['checked'])) {
print '<input type="text" class="flat" name="search_task_progress" value="'.$search_task_progress.'" size="4">'; print '<input type="text" class="flat" name="search_task_progress" value="'.$search_task_progress.'" size="4">';
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['t.progress_summary']['checked'])) {
print '<td class="liste_titre"></td>';
}
if (!empty($arrayfields['t.budget_amount']['checked'])) { if (!empty($arrayfields['t.budget_amount']['checked'])) {
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
print '<input type="text" class="flat" name="search_task_budget_amount" value="'.$search_task_budget_amount.'" size="4">'; print '<input type="text" class="flat" name="search_task_budget_amount" value="'.$search_task_budget_amount.'" size="4">';
print '</td>'; print '</td>';
} }
if (!empty($arrayfields['t.progress_summary']['checked'])) {
print '<td class="liste_titre"></td>';
}
if (!empty($arrayfields['t.tobill']['checked'])) { if (!empty($arrayfields['t.tobill']['checked'])) {
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
} }
@ -1146,7 +1148,7 @@ while ($i < min($num, $limit)) {
} }
$totalarray['val']['t.budget_amount'] += $obj->budget_amount; $totalarray['val']['t.budget_amount'] += $obj->budget_amount;
if (!$i) { if (!$i) {
$totalarray['totalbudgetamount'] = $totalarray['nbfield']; $totalarray['totalbudget_amount'] = $totalarray['nbfield'];
} }
$totalarray['totalbudgetamount'] += $obj->budget_amount; $totalarray['totalbudgetamount'] += $obj->budget_amount;
print '</td>'; print '</td>';
@ -1267,7 +1269,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
print '<td class="center">'.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).'</td>'; print '<td class="center">'.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).'</td>';
} elseif ($totalarray['totalbilledfield'] == $i) { } elseif ($totalarray['totalbilledfield'] == $i) {
print '<td class="center">'.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).'</td>'; print '<td class="center">'.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).'</td>';
} elseif ($totalarray['totalbudgetamount'] == $i) { } elseif ($totalarray['totalbudget_amount'] == $i) {
print '<td class="center">'.price($totalarray['totalbudgetamount'], 0, $langs, 1, 0, 0, $conf->currency).'</td>'; print '<td class="center">'.price($totalarray['totalbudgetamount'], 0, $langs, 1, 0, 0, $conf->currency).'</td>';
} else { } else {
print '<td></td>'; print '<td></td>';