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

Parameter Setting Currency USD

See merge request !1785

src/api/index.js

@@ -184,6 +184,7 @@ const create = (type = "") => {
   const uploadParameter = (body) => api.post('/setting/import_setting', body)
   const searchParameter = (body) => api.post('setting/search_setting', body)
   const deleteParameter = (id) => api.post(`setting/delete_setting/${id}`)
+  const getDataReport = () => api.get('type_report/get_all_type_report')
 
   // MASTER DATA - CAT
   const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
@@ -608,6 +609,7 @@ const create = (type = "") => {
     getDetailReportMB,
     deleteUnitBisnis,
     deleteParameter,
+    getDataReport,
     deletePerusahaan,
     deleteReportItems,
     getCarfmDocumentBySubmenu,

src/container/BudgetTahunan/BalanceSheet.js

@@ -221,6 +221,7 @@ export default class BalanceSheet extends Component {
                     }
                 }
             })
+            console.log(dataTable);
             this.setState({ dataTable, loading: false, buttonError: true, editable: true })
         } else {
             this.setState({ dataTable, loading: false, buttonError: true, editable: true })

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -565,7 +565,6 @@ export default class FixedAssetsMovement extends Component {
                         if (Bfr !== undefined) {
                             let data = 24
                             let period = Number(this.props.periode) - 1
-                            // console.log(dataTable2[tableMeta.rowIndex][data])
                             anjay.push(0)
                             let indexID = dataTable2[tableMeta.rowIndex][data].findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == period)
                             if (indexID !== -1) {
@@ -952,7 +951,8 @@ export default class FixedAssetsMovement extends Component {
                                                     type="text"
                                                     placeholder=""
                                                     disabled={true}
-                                                    value={Number(handleBfr(value, tableMeta)).toFixed(1)}
+                                                    value={Number(value).toFixed(1)}
+                                                    // value={Number(handleBfr(value, tableMeta)).toFixed(1)}
                                                 />
                                             }
                                         />