Merge branch 'deni-dev(pc)' into 'master'

ro

See merge request !451

src/container/RollingOutlook.js

@@ -2,17 +2,13 @@ import React, { Component } from 'react';
 import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel } from '@material-ui/core';
 import MUIDataTable from 'mui-datatables';
 import Images from '../assets/Images';
-import BalanceSheet from './BudgetTahunan/BalanceSheet';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../library/Utils';
-import ProfitLoss from './BudgetTahunan/ProfitLoss';
-import TaxPlanning from './BudgetTahunan/TaxPlanning';
-import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
-import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
 import { ExcelRenderer } from 'react-excel-renderer';
 import UploadFile from "../library/Upload";
 import { format } from 'date-fns';
+import BalanceSheetRO from './RollingOutlook/BalanceSheetRO';
 
 export default class RollingOutlook extends Component {
     constructor(props) {
@@ -522,6 +518,14 @@ export default class RollingOutlook extends Component {
                         </div>
                     </div>
                 )}
+
+                {this.state.visibleBS && (
+                    <BalanceSheetRO
+                        width={this.props.width}
+                        open={this.props.open}
+                        onClickClose={() => this.setState({ visibleBS: false, visibleRollingOutlook: true })}
+                    />
+                )}
             </div >
         );
     }