Merge branch 'Faisal' into 'master'

note cf sum!

See merge request !1550

src/container/Laporan/TableSubHolding.js

@@ -26139,28 +26139,38 @@ export default class TableSubHolding extends Component {
                         </div>
                         :
                         this.props.type === 7 || this.props.type === 8 ? 
-                        <div style={{ paddingLeft: 20, paddingBottom: 40 }}>
-                            <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, textDecorationLine: 'underline' }}>Notes:</Typography>
-                                </div>
+                            <div style={{ paddingLeft: 20, paddingBottom: 40 }}>
                                 <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, fontWeight: 'bold' }}>Rolling Outlook (Full Year) or Rolling Budget (RB)</Typography>
-                                </div>
-                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jan-Mar = MB figures</Typography>
-                                </div>
-                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Apr-Jun = OL Q1 figures or MB figures (if OL Q1 not available)</Typography>
-                                </div>
-                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jul-Sep = OL Q2 figures or OL Q1 (if OL Q2 not available) or MB (if OL Q2 and OL Q1 not available)</Typography>
-                                </div>
-                                <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Oct-Dec = OL Q3 figures or OL Q2 (if OL Q3 not available) and consecutive to the MB</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, textDecorationLine: 'underline' }}>Notes:</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, fontWeight: 'bold' }}>Rolling Outlook (Full Year) or Rolling Budget (RB)</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jan-Mar = MB figures</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Apr-Jun = OL Q1 figures or MB figures (if OL Q1 not available)</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Jul-Sep = OL Q2 figures or OL Q1 (if OL Q2 not available) or MB (if OL Q2 and OL Q1 not available)</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', paddingLeft: 10, justifyContent: 'space-between', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 0 }}>Period Oct-Dec = OL Q3 figures or OL Q2 (if OL Q3 not available) and consecutive to the MB</Typography>
+                                    </div>
+                            </div>
+                            :
+                            this.props.type === 6 ?
+                                <div style={{ paddingLeft: 20, paddingBottom: 40 }}>
+                                    <div style={{ display: 'flex', maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, textDecorationLine: 'underline' }}>Notes:</Typography>
+                                    </div>
+                                    <div style={{ display: 'flex', paddingLeft: 10, maxWidth: '100%', paddingRight: 15 }}>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Cash flow historical 2010-2020 zero balance due to incomplete beginning data</Typography>
+                                    </div>
                                 </div>
-                        </div>
-                        :
-                        null
+                                :
+                                null
                 }
             </div>
         )