Merge branch 'didam' into 'master'

periode

See merge request !536

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -506,7 +506,7 @@ export default class FixedAssetsMovement extends Component {
                                 // console.log(valuezz)
                             }
                         } else {
-                            let indexID = value.formula.findIndex((val) => val.item_formula == String(`@${item}`))
+                            let indexID = value.formula.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
                             // console.log(indexID)
                             if (indexID !== -1) {
                                 // console.log(value.formula[indexID].value)