Merge branch 'master' into 'faisal'

# Conflicts:
#   src/container/MonthlyReport.js

src/container/MonthlyReport.js

@@ -5,7 +5,6 @@ import Images from '../assets/Images';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../library/Utils';
-import TaxPlanning from './BudgetTahunan/TaxPlanning';
 import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
 import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
 import { ExcelRenderer } from 'react-excel-renderer';
@@ -332,8 +331,9 @@ export default class MonthlyReport extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                        // tableMeta.rowData[5] ? this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) : null
+                                        // tableMeta.rowData[5] ? 
+                                        this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) 
+                                        // : null
                                     }
                                 >
                                     <Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
@@ -547,7 +547,7 @@ export default class MonthlyReport extends Component {
 
                 )}
                 {this.state.visibleTP && (
-                    <TaxPlanning
+                    <TaxPlanningMR
                         open={this.props.open}
                         report_id={this.state.report_id}
                         height={this.props.height}