Merge branch 'rifka' into 'master'

ngisu tp

See merge request !849

src/container/MonthlyReport/TaxPlanningMR.js

@@ -574,7 +574,7 @@ export default class TaxPlanningMR extends Component {
                                 }
                             } else {
                                 let data = tableMeta.rowData[12]
-                                let indexID = data.findIndex((val) => val.item_formula == String(`${item}`) && val.periode == Number(this.props.periode))
+                                let indexID = data.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
                                 if (indexID !== -1) {
                                     let valuezz = data[indexID].value
                                     anjay.push(valuezz == "" ? 0 : valuezz)