Merge branch 'rifka' into 'master'

tp-mr & ro

See merge request !680

src/container/RollingOutlook.js

@@ -15,6 +15,7 @@ import { DatePicker } from '@material-ui/pickers';
 import moment from 'moment';
 import BalanceSheetRO from './RollingOutlook/BalanceSheetRO';
 import ProfitLossRO from './RollingOutlook/ProfitLossRO';
+import TaxPlanningRO from './RollingOutlook/TaxPlanningRO';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -1200,6 +1201,22 @@ export default class RollingOutlook extends Component {
                     />
                 )}
 
+                {this.state.visibleTP && (
+                    <TaxPlanningRO
+                        width={this.props.width}
+                        height={this.props.height}
+                        open={this.props.open}
+                        report_id={this.state.report_id}
+                        company={this.state.company}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        submissionID={this.state.submissionID}
+                        onClickClose={() => this.setState({ visibleTP: false, visibleRollingOutlook: true })}
+                        status={this.state.status}
+                        lastStatus={this.state.lastStatus}
+                    />
+                )}
+
 
                 {this.state.visibleRevision && (
                     <div className="test app-popup-show">