Merge branch 'GGMAC' into 'master'

cf

See merge request !1250

src/container/BudgetTahunan/CashFlow.js

@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
                                         </div>
                                     </button>
                                 </div>
-                                {/* {this.props.isApprover === true || dataTable2.length == 0 ? null :
-                                    (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
+                                {this.props.isApprover === true || dataTable2.length == 0 ? null :
+                                    (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
                                     <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                     <button
                                         type="button"
@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
                                         </div>
                                     </button>
                                 </div> 
-                                {/* // : null} */}
+                                : null}
                             </div>
                         </div>
                     </Paper>