Commit 8d4d3d4e authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'rifka' into 'master'

add email column in upload preview apprv

See merge request !257
parents 4a5b3424 1d481be1
......@@ -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 })}
/>
)}
......
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment