Merge branch 'deni-dev(pc)' into 'master'

yby

See merge request !568

src/container/BudgetTahunan.js

@@ -1345,7 +1345,7 @@ export default class BudgetTahunan extends Component {
                         periode={this.state.periode.periode}
                         submissionID={this.state.submissionID}
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
-                        onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
+                        onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
                         getReport={this.getSubmission.bind(this)}
                         isApprover={this.state.isApprover}
                         status={this.state.status}

src/container/Laporan/SubHolding.js

@@ -489,7 +489,7 @@ export default class SubHolding extends Component {
                 let url = window.URL.createObjectURL(res);
                 let a = document.createElement('a');
                 a.href = url;
-                a.download = 'Report DB Profit $ Loss.xlsx';
+                a.download = 'Report DB Profit & Loss.xlsx';
                 a.click();
             }
         } else {