diff --git a/ui/src/pages/ProductionProductCostingHasCostDetail.vue b/ui/src/pages/ProductionProductCostingHasCostDetail.vue index c2de28b..d58a904 100644 --- a/ui/src/pages/ProductionProductCostingHasCostDetail.vue +++ b/ui/src/pages/ProductionProductCostingHasCostDetail.vue @@ -2915,15 +2915,25 @@ function resolveGroupRawTRYTutar (grp) { return rowsForGroupTotal(grp).reduce((total, row) => total + parseMoneyInput(row?.lTutar), 0) } +function resolveGroupRowTRYAmount (row) { + const storedAmount = parseMoneyInput(row?.lTutar) + return storedAmount !== 0 ? storedAmount : resolveRowTRYTutar(row) +} + +function resolveGroupRowUSDAmount (row) { + const storedAmount = parseMoneyInput(row?.usdTutar ?? row?.lTutarUSD) + return storedAmount !== 0 ? storedAmount : resolveRowUSDTutar(row) +} + function resolveGroupTRYTutar (grp, _revision) { return rowsForGroupTotal(grp).reduce((total, row) => ( - total + (shouldIncludeRowInGroupTotal(grp, row) ? parseMoneyInput(row?.lTutar) : 0) + total + (shouldIncludeRowInGroupTotal(grp, row) ? resolveGroupRowTRYAmount(row) : 0) ), 0) } function resolveGroupUSDTutar (grp, _revision) { return rowsForGroupTotal(grp).reduce((total, row) => ( - total + (shouldIncludeRowInGroupTotal(grp, row) ? parseMoneyInput(row?.usdTutar ?? row?.lTutarUSD) : 0) + total + (shouldIncludeRowInGroupTotal(grp, row) ? resolveGroupRowUSDAmount(row) : 0) ), 0) }