Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Env dev

See merge request !2215

src/container/Reports/SubHolding.js

@@ -4345,6 +4345,8 @@ export default class SubHolding extends Component {
                                         onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
                                             this.getReportType()
                                             this.getCurrency(newInputValue.company_id)
+                                            let bizpar = this.state.usdBefore2024 == false && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
+                                            this.setState({ report: bizpar[0], reportType: bizpar })
                                         })}
                                         disableClearable
                                         style={{ width: 250 }}