Merge branch 'dev/riri' into 'ENV-DEV'

Update

See merge request !1844

src/container/MasterData/Company/CreateCompany.js

@@ -378,7 +378,7 @@ export default class CreatePerusahaan extends Component {
                 "default_currency": this.state.defaultCurrency.id
             }
             console.log(payload);
-            // this.props.updatePerusahaan(payload)
+            this.props.updatePerusahaan(payload)
         }
     }
 

src/container/RollingOutlook/ProfitLossRO.js

@@ -2423,8 +2423,8 @@ export default class ProfitLossROO extends Component {
                                 </div>
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Notes : {this.state.notesUpdate}</Typography>
                             </div>
-                            {/* {this.props.isApprover === true || this.state.dataTable.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 || this.state.dataTable.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="grid grid-2x" style={{ padding: 20 }}>
                                         <div className="col-1" style={{ paddingLeft: 0 }}>
                                             <button
@@ -2543,8 +2543,8 @@ export default class ProfitLossROO extends Component {
                                             </div>
                                         }
                                     </div>
-                            {/* : null
-                            } */}
+                                    : null
+                            }
                         </Paper>
                         :
                         <Paper style={{ paddingTop: 10 }}>

src/container/RollingOutlook/RollingOutlook.js

@@ -1731,9 +1731,9 @@ export default class RollingOutlook extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        // tableMeta.rowData[5] == true ?
+                                        tableMeta.rowData[5] == true ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                            // : null
+                                            : null
                                     }
                                 >
                                     {/* {this.state.isApprover == true ?