Merge branch 'rifka' into 'master'

mpus

See merge request !537

src/container/BudgetTahunan/TaxPlanning.js

@@ -766,7 +766,7 @@ export default class TaxPlanning extends Component {
                             } else {
                                 let data = dex == 1 ? value.tbc : dex == 2 ? value.fcp : value.tbf
                                 // console.log(data);
-                                let indexID = data.formula.findIndex((val) => val.item_formula == String(`@${item}`))
+                                let indexID = data.formula.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
                                 if (indexID !== -1) {
                                     let valuezz = data.formula[indexID].value
                                     anjay.push(valuezz == "" ? 0 : valuezz)