Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1254

src/container/BudgetTahunan/CashFlow.js

@@ -430,7 +430,7 @@ export default class CashFlow extends Component {
                                         if (tableMeta.rowData[5] == "Cash at the beginning period") {
                                             // console.log(dataTable2[tableMeta.rowIndex+1])
                                             // console.log(dataTable2[tableMeta.rowIndex+1][data].value)
-                                            let valuezzz = dataTable2[tableMeta.rowIndex + 1][data].value
+                                            let valuezzz = dataTable2[tableMeta.rowIndex][7].value
                                             forecastt += Number(valuezzz == "" ? 0 : valuezzz)
                                         } else {
                                             forecastt += Number(valuezz == "" ? 0 : valuezz)

src/container/MonthlyReport.js

@@ -629,7 +629,7 @@ export default class MonthlyReport extends Component {
                         // this.getPL(type)
                         if (type != undefined) {
                             // this.getCashFlow(type)
-                            // this.getPL(type)
+                            this.getPL(type)
                         } else {
                             this.setState({ loading: false })
                         }