Merge branch 'GGMAC' into 'master'

update

See merge request !1268

src/container/BudgetTahunan.js

@@ -535,7 +535,7 @@ export default class BudgetTahunan extends Component {
                         this.getLatestPeriodSubmit()
                         // this.getCashFlow(type)
                         // this.getPL(type)
-                        if (type != undefined) {
+                        if (type != undefined && type == 'PL') {
                             // this.getCashFlow(type)
                             this.getPL(type)
                         } else {
@@ -2525,7 +2525,7 @@ export default class BudgetTahunan extends Component {
             </div>
         );
         return (
-            <div style={{ flex: 1, backgroundColor: '#f8f8f8' }} ref={this.myRef}>
+            <div style={{ flex: 1, backgroundColor: '#f8f8f8' }} >
                 <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
                         {this.state.messageAlert}

src/container/MonthlyReport.js

@@ -626,7 +626,7 @@ export default class MonthlyReport extends Component {
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
                         // this.getPL(type)
-                        if (type != undefined) {
+                        if (type != undefined && type == 'PL') {
                             this.getPL(type)
                         } else {
                             this.setState({ loading: false })