Merge branch 'riri' into 'master'

Riri

See merge request !1351

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -2045,8 +2045,7 @@ export default class OperatingIndicatorRO extends Component {
                                 {!this.state.emptyData && <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.data.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}
-                                        </Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>

src/container/RollingOutlook/ProfitLossRO.js

@@ -910,7 +910,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `${Number(this.props.periode) - 1} Total`,
+                name: `${Number(this.props.periode) - 1} Total Actual`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -2184,7 +2184,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `${this.props.periode} Total`,
+                name: `${this.props.periode} Total Outlook`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -2316,7 +2316,7 @@ export default class ProfitLossROO extends Component {
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>
@@ -2540,7 +2540,7 @@ export default class ProfitLossROO extends Component {
                             <div style={{ padding: 20 }}>
                                 <div>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision}) </Typography>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>