Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into GGMAC

src/container/Laporan/DashboardCAT.js

@@ -42,8 +42,8 @@ export default class DashboardCAT extends Component {
         this.props.selectIndex('CAT Dashboard')
         let dataStorageCAT = localStorage.getItem(Constant.DATACAT)
         console.log(dataStorageCAT)
-        if (dataStorageCAT != 'datacat') {
-            this.setState({ selectedKPI: JSON.parse(dataStorageCAT).listKPI })
+        if (dataStorageCAT != 'datacat' && dataStorageCAT != null) {
+            this.setState({selectedKPI: JSON.parse(dataStorageCAT).listKPI})
             console.log(dataStorageCAT)
         }
         if (this.props.location.state !== undefined) {

src/container/Laporan/TableSubHolding.js

@@ -8391,7 +8391,7 @@ export default class TableSubHolding extends Component {
                     }
                 }
             }, {
-                name: `MB ${this.props.periode} (Trial Balance - Fiscal)`,
+                name: `MB ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >