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

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';
@@ -14,6 +13,7 @@ import { format } from 'date-fns';
 import BalanceSheetMR from './MonthlyReport/BalanceSheetMR';
 import ProfitLossMR from './MonthlyReport/ProfitLossMR';
 import TaxPlanningMR from './MonthlyReport/TaxPlanningMR';
+import FixedAssetsMovementMR from './MonthlyReport/FixedAssetsMovementMR';
 
 export default class MonthlyReport extends Component {
     constructor(props) {
@@ -331,7 +331,9 @@ export default class MonthlyReport extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        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>
@@ -545,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}
@@ -561,7 +563,15 @@ export default class MonthlyReport extends Component {
                     />
                 )}
                 {this.state.visibleFAM && (
-                    <FixedAssetsMovement
+                    <FixedAssetsMovementMR
+                        open={this.props.open}
+                        report_id={this.state.report_id}
+                        height={this.props.height}
+                        width={this.props.width}
+                        company={this.state.company}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        submissionID={this.state.submissionID}
                         onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })}
                     />
                 )}