Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1427

src/container/MonthlyReport.js

@@ -236,7 +236,8 @@ export default class MonthlyReport extends Component {
                             item.revision,
                             this.state.isApprovedMB ? (this.state.lastStatus === 'APPROVED' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : status_approv) : "CLOSED",
                             item.report_id,
-                            item.is_can_upload,
+                            // item.is_can_upload,
+                            item.report_name === "Cash Flow" ? item.is_can_upload : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload),
                             item.revision
                         ]
                     })

src/container/MonthlyReport/ProfitLossMR.js

@@ -136,8 +136,8 @@ export default class ProfitLossMR extends Component {
             checkStatus = false
         }
 
-        // this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
-        this.setState({viewOnly: true})
+        this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
+        // this.setState({viewOnly: true})
     }
 
     handleGetFor(type) {

src/container/OutlookPA.js

@@ -221,7 +221,8 @@ export default class OutlookPA extends Component {
                             item.revision,
                             this.state.isSubmit === false ? "CLOSED" : item.current_status,
                             item.report_id,
-                            Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
+                            // Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
+                            item.report_name === "Cash Flow" ? item.is_can_upload : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload),
                             item.revision
                         ]
                     })

src/container/RollingOutlook.js

@@ -267,7 +267,8 @@ export default class RollingOutlook extends Component {
                             item.revision,
                             this.state.isSubmit === false ? "CLOSED" : item.current_status,
                             item.report_id,
-                            Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
+                            // Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
+                            item.report_name === "Cash Flow" ? item.is_can_upload : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload),
                             item.revision
                         ]
                     })