Merge branch 'faisal' into 'master'

update sore 210920

See merge request !341

src/container/BudgetTahunan.js

@@ -661,8 +661,7 @@ export default class BudgetTahunan extends Component {
                         submissionID={this.state.submissionID}
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })}
-                        getReport={this.getReport.bind(this)}
-                        getReportAttachment={this.getReportAttachment.bind(this)}
+                        getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
                 {this.state.visibleCAT && (
@@ -677,8 +676,7 @@ export default class BudgetTahunan extends Component {
                         submissionID={this.state.submissionID}
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
-                        getReport={this.getReport.bind(this)}
-                        getReportAttachment={this.getReportAttachment.bind(this)}
+                        getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
             </div >