Merge branch 'didam' into 'master'

Didam

See merge request !676

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -985,8 +985,7 @@ export default class CorporateAnnualTarget extends Component {
                             }
                         } else {
                             // console.log(dataTable2[tableMeta.rowIndex][30])
-                            let array = dataTable2[tableMeta.rowIndex][30].filter((val) => val.periode == Number(this.props.periode))
-
+                            let array = dataTable2[tableMeta.rowIndex][30].filter((val) => val.periode == Number(column))
                             let valuezz = array[0].value
                             // console.log(valuezz)
                             anjay.push(valuezz == "" ? 0 : valuezz)
@@ -1145,7 +1144,7 @@ export default class CorporateAnnualTarget extends Component {
                     }
                 }
             })
-            // if (dataTable2[tableMeta.rowIndex][6] == "ROIC" && forecast == undefined) {
+            // if (dataTable2[tableMeta.rowIndex][6] == "NPAT" && forecast !== undefined) {
             //     console.log(tableMeta.rowData[3])
             //     console.log(splitFormula)
             //     console.log(baru)