Merge branch 'env/ridwan' into 'ENV-DEV-CR-CAFRM'

fixing name download

See merge request !1610

src/container/ReportCarfm/RepotrCafrm.js

@@ -183,7 +183,7 @@ class RepotrCafrm extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = `Progress Report CARFM ${this.state.curYear}-${this.state.curYear}.xlsx`;
+            a.download = `Progress Report CARFM ${this.state.curYear}-${this.state.curMonth}.xlsx`;
             a.click();
         }
     }