Commits · 35324807079cbecfd51d0bba6152869387412779 · Dida Adams Arizona / Tia-dev

18 Apr, 2023 2 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 35324807
  qorri_di authored Apr 18, 2023
```
Fixing Tax Planning by rifka

See merge request !1782
```
  35324807
- Fixing Tax Planning by rifka · 8f1ec8c2
  qorri_di authored Apr 18, 2023
```
- MR
- RO
```
  8f1ec8c2
12 Apr, 2023 8 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 61ca1917
  Riri Novita authored Apr 12, 2023
```
UI OLPA CF

See merge request !1779
```
  61ca1917
- Merge branch 'dev/riri' into 'ENV-DEV' · eef9e9c4
  Riri Novita authored Apr 12, 2023
```
UI OLPA CF

See merge request !1778
```
  eef9e9c4
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · 53da3499
  Riri Novita authored Apr 12, 2023
  
  53da3499
- UI OLPA CF · ac63d818
  Riri Novita authored Apr 12, 2023
  
  ac63d818
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 3f7bce26
  Riri Novita authored Apr 12, 2023
```
issue reminder

See merge request !1777
```
  3f7bce26
- Merge branch 'dev/riri' into 'ENV-DEV' · b07ac26b
  Riri Novita authored Apr 12, 2023
```
issue reminder

See merge request !1776
```
  b07ac26b
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · c47b5d7d
  Riri Novita authored Apr 12, 2023
  
  c47b5d7d
- issue reminder · a29e02aa
  Riri Novita authored Apr 12, 2023
  
  a29e02aa
11 Apr, 2023 8 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 410265c7
  Riri Novita authored Apr 11, 2023
```
update

See merge request !1775
```
  410265c7
- Merge branch 'dev/riri' into 'ENV-DEV' · b242e5f9
  Riri Novita authored Apr 11, 2023
```
update

See merge request !1774
```
  b242e5f9
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · 8dae6a34
  Riri Novita authored Apr 11, 2023
  
  8dae6a34
- update · e954da50
  Riri Novita authored Apr 11, 2023
  
  e954da50
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 63e741f3
  Riri Novita authored Apr 11, 2023
```
issue ratio

See merge request !1773
```
  63e741f3
- Merge branch 'dev/riri' into 'ENV-DEV' · 7b0a197c
  Riri Novita authored Apr 11, 2023
```
Issue Ratio

See merge request !1772
```
  7b0a197c
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · 8c71355c
  Riri Novita authored Apr 11, 2023
  
  8c71355c
- issue ga berkesudahan · 19d3c65b
  Riri Novita authored Apr 11, 2023
  
  19d3c65b
10 Apr, 2023 3 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · ec5d2f93
  Riri Novita authored Apr 10, 2023
```
Fixing CF dan Reminder

See merge request !1771
```
  ec5d2f93
- Merge branch 'dev/riri' into 'ENV-DEV' · 404c3a3e
  Riri Novita authored Apr 10, 2023
```
Fixing CF dan Reminder

See merge request !1770
```
  404c3a3e
- Fixing CF dan Reminder · d93582f2
  Riri Novita authored Apr 10, 2023
  
  d93582f2
05 Apr, 2023 14 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 10db258f
  qorri_di authored Apr 05, 2023
```
Env dev

See merge request !1769
```
  10db258f
- Fixing CF-Summary - Subco · 9101378a
  qorri_di authored Apr 05, 2023
```
- periode == yearNow - 1
```
  9101378a
- Fixing CF-Summary - Subco · 039a35a1
  qorri_di authored Apr 05, 2023
```
- periode == yearNow - 1
```
  039a35a1
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · ff61da50
  qorri_di authored Apr 05, 2023
```
Fixing Conflic Merge

See merge request !1768
```
  ff61da50
- Fixing Conflic Merge · f23471fa
  qorri_di authored Apr 05, 2023
  
  f23471fa
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 8c209886
  qorri_di authored Apr 05, 2023
```
Fixing Conflic Merge

See merge request !1767
```
  8c209886
- Fixing Conflic Merge · e0d3486d
  qorri_di authored Apr 05, 2023
  
  e0d3486d
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 76e07ab0
  qorri_di authored Apr 05, 2023
```
Env dev

See merge request !1765
```
  76e07ab0
- Merge branch 'ENV-PROD' of http://103.44.149.204/d.arizona/tia-dev into ENV-DEV · 5a37d455
  qorri_di authored Apr 05, 2023
```
 Conflicts:
	src/container/Auth/Login.js
	src/container/DownloadReport/DownloadReport.js
	src/container/GeneralSetting/MaintenanceMode.js
	src/container/ProgressReport/ProgressReport.js
	src/container/ProgressReport/TableProgressReport.js
	src/container/Reports/SubHolding.js
	src/container/Reports/TableSubHolding.js
	src/container/RollingOutlook/CashFlowRO.js
	src/container/SummaryTriputra/TableSummaryTriputra.js
```
  5a37d455
- Merge branch 'ISSUE-2022' into 'ENV-PROD' · fabc702a
  qorri_di authored Apr 05, 2023
```
Issue 2022

See merge request !1764
```
  fabc702a
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · dc272876
  Riri Novita authored Apr 05, 2023
```
Header

See merge request !1763
```
  dc272876
- Merge branch 'dev/riri' into 'ENV-DEV' · 83856731
  Riri Novita authored Apr 05, 2023
```
Header

See merge request !1762
```
  83856731
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · 15d1d2d1
  Riri Novita authored Apr 05, 2023
  
  15d1d2d1
- Style Header · 4b329532
  Riri Novita authored Apr 05, 2023
  
  4b329532
04 Apr, 2023 5 commits
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 0ac6733e
  Riri Novita authored Apr 04, 2023
```
Fixing Finantial Ratio

See merge request !1761
```
  0ac6733e
- Merge branch 'dev/riri' into 'ENV-DEV' · 6cc12f40
  Riri Novita authored Apr 04, 2023
```
Fixing Finantial Ratio

See merge request !1760
```
  6cc12f40
- Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri · aca0fb78
  Riri Novita authored Apr 04, 2023
  
  aca0fb78
- Fixing Finantial Ratio · ce36b2a0
  Riri Novita authored Apr 04, 2023
  
  ce36b2a0
- Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' · 34329f0a
  Riri Novita authored Apr 04, 2023
```
Issue Finantial

See merge request !1759
```
  34329f0a