Merge branch 'GGMAC' into 'master'

loading

See merge request !1204

src/container/BudgetTahunan.js

@@ -537,6 +537,8 @@ export default class BudgetTahunan extends Component {
                         if (type != undefined) {
                             this.getCashFlow(type)
                             this.getPL(type)
+                        } else {
+                            this.setState({loading: false})
                         }
                         // this.getFR(type)
                         api.create().checkApprover().then(response => {