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

Merge pull request #23608 from atm-adrien/17.0_FIX_Sub_bom_costs

Browse Source 
FIX : Sub bom costs were not good
This commit is contained in:
Laurent Destailleur 2023-01-18 20:10:14 +01:00 committed by GitHub
commit 74085bb1de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/bom/tpl/objectline_view.tpl.php
View File

@ -167,9 +167,14 @@ if ($filtertype != 1) {
}
}
$total_cost = 0;
$tmpbom->calculateCosts();
print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
$coldisplay++;
echo '<span class="amount">'.price($line->total_cost).'</span>';
if (!empty($line->fk_bom_child)) {
echo '<span class="amount">'.price($tmpbom->total_cost).'</span>';
} else {
echo '<span class="amount">'.price($line->total_cost).'</span>';
}
print '</td>';
if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
@ -317,15 +322,5 @@ if ($resql) {
}
}
// Replace of the total_cost value by the sum of all sub-BOM lines total_cost
// TODO Remove this bad practice. We should not replace content of ouput using javascript but value should be good during generation of output.
if ($total_cost > 0) {
$line->total_cost = price($total_cost);
?>
<script>
$('#costline_<?php echo $line->id?>').html('<?php echo "<span class=\"amount\">".price($total_cost)."</span>"; ?>');
</script>
<?php
}
print "<!-- END PHP TEMPLATE objectline_view.tpl.php -->\n";