Merge branch 'didam' into 'master'

apdet

See merge request !721

src/api/index.js

@@ -272,7 +272,8 @@ const create = (type = "") => {
   const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body)
   const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
-
+  const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -487,7 +488,9 @@ const create = (type = "") => {
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
     uploadMonthlyReportPL,
-    getMonthlyReport
+    getMonthlyReport,
+    checkUploadMonthlyReportBS,
+    uploadMonthlyReportBS
   }
 }
 

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -666,7 +666,8 @@ export default class FixedAssetsMovement extends Component {
                 if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
                     let indexID = dataTable2.findIndex((val, index) => String(val[5]).toLocaleLowerCase() == 'ending balance' && dataTable2[index-1][2] == tableMeta.rowData[2])
                     if (indexID !== -1) {
-                        total = dataTable2[indexID][18].value
+                        // console.log(dataTable2)
+                        total = tableMeta.columnIndex == 21? dataTable2[indexID][20] : dataTable2[indexID][18].value
                     }
                 } else {
                     let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)