Commit 9d91ad5a authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-dev(pc)' into 'master'

bakso rusuk joss

See merge request !557
parents f0008dba b5d3e6b9
......@@ -392,7 +392,7 @@ export default class SubHolding extends Component {
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
item.profit_detail.forecast_formula == null? [] : item.profit_detail.forecast_formula
item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula
])
if (item.children !== null) {
......@@ -430,7 +430,7 @@ export default class SubHolding extends Component {
item.order,
item.condition_it_should_be,
item.condition_if_wrong,
item.profit_detail.forecast_formula == null? [] : item.profit_detail.forecast_formula
item.profit_detail.forecast_formula == null ? [] : item.profit_detail.forecast_formula
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -481,6 +481,10 @@ export default class SubHolding extends Component {
a.download = 'Master Budget Profit & Loss.xlsx';
a.click();
}
} else {
setTimeout(() => {
this.setState({ loading: false })
}, 1000);
}
}
......
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