Commit f6f26ae6 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'rifka' into 'master'

nambahin di month report

See merge request !562
parents 5b08a77e d3c14292
...@@ -13,6 +13,7 @@ import UploadFile from "../library/Upload"; ...@@ -13,6 +13,7 @@ import UploadFile from "../library/Upload";
import { format } from 'date-fns'; import { format } from 'date-fns';
import BalanceSheetMR from './MonthlyReport/BalanceSheetMR'; import BalanceSheetMR from './MonthlyReport/BalanceSheetMR';
import ProfitLossMR from './MonthlyReport/ProfitLossMR'; import ProfitLossMR from './MonthlyReport/ProfitLossMR';
import TaxPlanningMR from './MonthlyReport/TaxPlanningMR';
export default class MonthlyReport extends Component { export default class MonthlyReport extends Component {
constructor(props) { constructor(props) {
...@@ -545,9 +546,18 @@ export default class MonthlyReport extends Component { ...@@ -545,9 +546,18 @@ export default class MonthlyReport extends Component {
)} )}
{this.state.visibleTP && ( {this.state.visibleTP && (
<TaxPlanning <TaxPlanning
open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
height={this.props.height}
width={this.props.width}
company={this.state.company} company={this.state.company}
onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })} revision={this.state.revisionTable}
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
// getReport={this.getCompanyActive.bind(this)}
// onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
/> />
)} )}
{this.state.visibleFAM && ( {this.state.visibleFAM && (
......
...@@ -39,7 +39,7 @@ const style2 = { ...@@ -39,7 +39,7 @@ const style2 = {
top: 0 top: 0
}; };
export default class TaxPlanning extends Component { export default class TaxPlanningMR extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
......
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