Commit a86a2a06 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

olpa++

See merge request !1282
parents c85c7030 55cea835
......@@ -175,7 +175,7 @@ export default class ProfitLossOLPA extends Component {
item.level,
item.description,
item.profit_loss.notes === "" ? null : item.profit_loss.notes,
item.profit_loss.total_last_year === undefined ? "0.0" : item.profit_loss.total_last_year === "" ? "0" : item.profit_loss.total_last_year,
item.profit_loss.total_actual_before === null ? "0.0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
item.profit_loss.january,
item.profit_loss.february,
item.profit_loss.march,
......@@ -188,7 +188,7 @@ export default class ProfitLossOLPA extends Component {
item.profit_loss.october,
item.profit_loss.november,
item.profit_loss.december,
item.profit_loss.total_year === undefined ? "0.0" : item.profit_loss.total_year,
item.profit_loss.total_current_year,
item.profit_loss.ytd_oct === undefined ? "0.0" : item.profit_loss.ytd_oct,
item.profit_loss.nov_dec === undefined ? "0.0" : item.profit_loss.nov_dec,
item.order
......@@ -211,7 +211,7 @@ export default class ProfitLossOLPA extends Component {
item.level,
item.description,
item.profit_loss.notes === "" ? null : item.profit_loss.notes,
item.profit_loss.total_last_year === undefined ? "0.0" : item.profit_loss.total_last_year === "" ? "0" : item.profit_loss.total_last_year,
item.profit_loss.total_actual_before === null ? "0.0" : item.profit_loss.total_actual_before === "" ? "0" : item.profit_loss.total_actual_before,
item.profit_loss.january,
item.profit_loss.february,
item.profit_loss.march,
......@@ -224,7 +224,7 @@ export default class ProfitLossOLPA extends Component {
item.profit_loss.october,
item.profit_loss.november,
item.profit_loss.december,
item.profit_loss.total_year === undefined ? "0.0" : item.profit_loss.total_year,
item.profit_loss.total_current_year,
item.profit_loss.ytd_oct === undefined ? "0.0" : item.profit_loss.ytd_oct,
item.profit_loss.nov_dec === undefined ? "0.0" : item.profit_loss.nov_dec,
item.order
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment