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

Fixing Conflic Merge See merge request !1768

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'
Fixing Conflic Merge See merge request !1768
ff61da50 · qorri_di · 8c209886 · f23471fa · ff61da50 · ff61da50
Commit ff61da50 authored Apr 05, 2023 by qorri_di
42 changed files
--- a/src/container/Auth/Login.js
+++ b/src/container/Auth/Login.js
--- a/src/container/BudgetTahunan/BalanceSheet.js
+++ b/src/container/BudgetTahunan/BalanceSheet.js
--- a/src/container/BudgetTahunan/BudgetTahunan.js
+++ b/src/container/BudgetTahunan/BudgetTahunan.js
--- a/src/container/BudgetTahunan/CashFlow.js
+++ b/src/container/BudgetTahunan/CashFlow.js
--- a/src/container/BudgetTahunan/CorporateAnnualTarget.js
+++ b/src/container/BudgetTahunan/CorporateAnnualTarget.js
--- a/src/container/BudgetTahunan/FixedAssetsMovement.js
+++ b/src/container/BudgetTahunan/FixedAssetsMovement.js
--- a/src/container/BudgetTahunan/ProfitLoss.js
+++ b/src/container/BudgetTahunan/ProfitLoss.js
--- a/src/container/BudgetTahunan/TaxPlanning.js
+++ b/src/container/BudgetTahunan/TaxPlanning.js
--- a/src/container/DownloadReport/DownloadReport.js
+++ b/src/container/DownloadReport/DownloadReport.js
--- a/src/container/Menu/Home.js
+++ b/src/container/Menu/Home.js
--- a/src/container/Menu/HomePage.js
+++ b/src/container/Menu/HomePage.js
--- a/src/container/MonthlyReport/BalanceSheetMR.js
+++ b/src/container/MonthlyReport/BalanceSheetMR.js
--- a/src/container/MonthlyReport/CashFlowMR.js
+++ b/src/container/MonthlyReport/CashFlowMR.js
--- a/src/container/MonthlyReport/CorporateAnnualTargetMR.js
+++ b/src/container/MonthlyReport/CorporateAnnualTargetMR.js
--- a/src/container/MonthlyReport/FixedAssetsMovementMR.js
+++ b/src/container/MonthlyReport/FixedAssetsMovementMR.js
--- a/src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
+++ b/src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
--- a/src/container/MonthlyReport/MonthlyReport.js
+++ b/src/container/MonthlyReport/MonthlyReport.js
--- a/src/container/MonthlyReport/OperatingIndicatorMR.js
+++ b/src/container/MonthlyReport/OperatingIndicatorMR.js
--- a/src/container/MonthlyReport/ProfitLossMR.js
+++ b/src/container/MonthlyReport/ProfitLossMR.js
--- a/src/container/MonthlyReport/TaxPlanningMR.js
+++ b/src/container/MonthlyReport/TaxPlanningMR.js
--- a/src/container/OperatingIndicator/OperatingIndicator.js
+++ b/src/container/OperatingIndicator/OperatingIndicator.js
--- a/src/container/OperatingIndicator/OperatingIndicatorDetail.js
+++ b/src/container/OperatingIndicator/OperatingIndicatorDetail.js
--- a/src/container/OutlookPA/BalanceSheetOLPA.js
+++ b/src/container/OutlookPA/BalanceSheetOLPA.js
--- a/src/container/OutlookPA/CashFlowOLPA.js
+++ b/src/container/OutlookPA/CashFlowOLPA.js
--- a/src/container/OutlookPA/CorporateAnnualTargetOLPA.js
+++ b/src/container/OutlookPA/CorporateAnnualTargetOLPA.js
--- a/src/container/OutlookPA/OutlookPA.js
+++ b/src/container/OutlookPA/OutlookPA.js
--- a/src/container/OutlookPA/ProfitLossOLPA.js
+++ b/src/container/OutlookPA/ProfitLossOLPA.js
--- a/src/container/OutlookPA/TaxPlanningOLPA.js
+++ b/src/container/OutlookPA/TaxPlanningOLPA.js
--- a/src/container/ProgressReport/ProgressReport.js
+++ b/src/container/ProgressReport/ProgressReport.js
--- a/src/container/Reports/SubHolding.js
+++ b/src/container/Reports/SubHolding.js
--- a/src/container/Reports/TableSubHolding.js
+++ b/src/container/Reports/TableSubHolding.js
--- a/src/container/RollingOutlook/BalanceSheetRO.js
+++ b/src/container/RollingOutlook/BalanceSheetRO.js
--- a/src/container/RollingOutlook/CashFlowRO.js
+++ b/src/container/RollingOutlook/CashFlowRO.js
--- a/src/container/RollingOutlook/CorporateAnnualTargetRO.js
+++ b/src/container/RollingOutlook/CorporateAnnualTargetRO.js
--- a/src/container/RollingOutlook/OperatingIndicatorRO.js
+++ b/src/container/RollingOutlook/OperatingIndicatorRO.js
--- a/src/container/RollingOutlook/ProfitLossRO.js
+++ b/src/container/RollingOutlook/ProfitLossRO.js
--- a/src/container/RollingOutlook/RollingOutlook.js
+++ b/src/container/RollingOutlook/RollingOutlook.js
--- a/src/container/RollingOutlook/TaxPlanningRO.js
+++ b/src/container/RollingOutlook/TaxPlanningRO.js
--- a/src/container/SummaryTriputra/SummaryOfTriputra.js
+++ b/src/container/SummaryTriputra/SummaryOfTriputra.js
--- a/src/container/SummaryTriputra/TableSummaryTriputra.js
+++ b/src/container/SummaryTriputra/TableSummaryTriputra.js
--- a/src/router/homeRoutes.js
+++ b/src/router/homeRoutes.js
--- a/src/router/index.js
+++ b/src/router/index.js