Commit 128b5ee3 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'riri' into 'master'

samery

See merge request !671
parents bc03aeef 646f25cd
...@@ -14,6 +14,7 @@ import PropagateLoader from "react-spinners/PropagateLoader" ...@@ -14,6 +14,7 @@ import PropagateLoader from "react-spinners/PropagateLoader"
import { DatePicker } from '@material-ui/pickers'; import { DatePicker } from '@material-ui/pickers';
import moment from 'moment'; import moment from 'moment';
import BalanceSheetRO from './RollingOutlook/BalanceSheetRO'; import BalanceSheetRO from './RollingOutlook/BalanceSheetRO';
import ProfitLossRO from './RollingOutlook/ProfitLossRO';
var ct = require("../library/CustomTable"); var ct = require("../library/CustomTable");
const getMuiTheme = () => createMuiTheme(ct.customTable()); const getMuiTheme = () => createMuiTheme(ct.customTable());
...@@ -1191,6 +1192,14 @@ export default class RollingOutlook extends Component { ...@@ -1191,6 +1192,14 @@ export default class RollingOutlook extends Component {
/> />
)} )}
{this.state.visiblePL && (
<ProfitLossRO
width={this.props.width}
open={this.props.open}
onClickClose={() => this.setState({ visiblePL: false, visibleRollingOutlook: true })}
/>
)}
{this.state.visibleRevision && ( {this.state.visibleRevision && (
<div className="test app-popup-show"> <div className="test app-popup-show">
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment