Merge branch 'didam' into 'master'

apdet arpin nyusahin

See merge request !714

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -663,9 +663,16 @@ export default class FixedAssetsMovement extends Component {
         const handleForecast = (tableMeta, periode) => {
             let total = 0
             if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'gain/ (loss) on fixed assets' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
-                let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)
-                if (indexID !== -1) {
-                    total = dataTable2[tableMeta.rowIndex][23][indexID].value
+                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
+                    }
+                } else {
+                    let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)
+                    if (indexID !== -1) {
+                        total = dataTable2[tableMeta.rowIndex][23][indexID].value
+                    }
                 }
             } else {
                 total = handleValueFormula(tableMeta.columnIndex, tableMeta)