Merge branch 'riri' into 'master'

issue 109

See merge request !1495

src/container/BudgetTahunan/ProfitLoss.js

@@ -635,7 +635,7 @@ export default class ProfitLoss extends Component {
                 //     operator.push(item)
                 // }
             })
-            // if (String(tableMeta.rowData[5]) == "Net Trading Profit (TPAT)") {
+            // if (String(tableMeta.rowData[5]) == "Net Income for the year (NPAT)") {
             // console.log(tableMeta.rowData[3])
             // console.log(arrayFormula)
             // console.log(arrayJumlah)
@@ -668,7 +668,7 @@ export default class ProfitLoss extends Component {
                 }
             })
             total = R.equals(total, NaN) ? "0.0" : (R.equals(total, Infinity) ? "0.0" : (total == "-Infinity" ? "0.0" : total))
-            // if (tableMeta.rowData[1] === 20092) {
+            // if (String(tableMeta.rowData[5]) == "Net Income for the year (NPAT)") {
             //     console.log(total);
             //     console.log(arrayJumlah);
             // }
@@ -676,9 +676,9 @@ export default class ProfitLoss extends Component {
             // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total)
             // // }
             // return Number(total)
-            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(data)
+            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total)
             // }
-            return Number(data)
+            return Number(total)
 
         }