Merge branch 'deni' into 'master'

sub holdingggg

See merge request !594

src/container/Laporan/TableSubHolding.js

@@ -310,7 +310,7 @@ export default class TableSubHolding extends Component {
 
                             // }
                             if (forecast != undefined) {
-                                    console.log(dataTable2[indexID][column])
+                                    // console.log(dataTable2[indexID][column])
                             }
                             let valuezz = dataTable2[indexID][column].value == undefined ? dataTable2[indexID][column] : dataTable2[indexID][column].value
                             anjay.push(valuezz == "" ? 0 : valuezz)
@@ -2899,7 +2899,7 @@ export default class TableSubHolding extends Component {
                     <MuiThemeProvider theme={getMuiTheme()}>
                         <MUIDataTable
                             data={dataTable2}
-                            columns={this.props.type === 1 ? columnDBBS : this.props.type === 2 ? columnDBPLDetail : this.props.type === 3 ? columnDBPL : columns}
+                            columns={this.props.type === 2 ? columnDBBS : this.props.type === 1 ? columnDBPLDetail : this.props.type === 3 ? columnDBPL : columns}
                             options={options}
                         />
                     </MuiThemeProvider>