Merge branch 'rifka' into 'master'

Rifka

See merge request !1169

src/container/Laporan/TableSubHolding.js

@@ -10204,7 +10204,7 @@ export default class TableSubHolding extends Component {
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
-                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
@@ -10246,7 +10246,7 @@ export default class TableSubHolding extends Component {
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
-                                                    style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
@@ -10611,7 +10611,7 @@ export default class TableSubHolding extends Component {
                     }
                 }
             },{
-                name: `ACTUAL ${Number(this.props.periode) - 1}`,
+                name: `ACTUAL LAST YEAR}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >