Merge branch 'rifka' into 'master'

add email column in upload preview apprv

See merge request !257

src/container/BudgetTahunan.js

@@ -612,7 +612,11 @@ export default class BudgetTahunan extends Component {
                 {this.state.visibleTP && (
                     <TaxPlanning
                         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}
                         onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
                     />
                 )}

src/container/Otorisasi/User.js

@@ -15,7 +15,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
 import ReactTooltip from "react-tooltip";
 import PopUpFailedSave from "../../library/PopUpFailedSave";
 import Constant from "../../library/Constant";
-import PopUpDelete from "../ApprovalMatrix/PopUpDelete";
+import PopUpDelete from "../ApprovalMatrix/PopUpDeleteAM";
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());