Merge branch 'rifka' into 'master'

log

See merge request !774

src/container/MonthlyReport/TaxPlanningMR.js

@@ -252,7 +252,7 @@ export default class TaxPlanningMR extends Component {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', submissionID: null, loading: false }, () => {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
                         document.body.style.overflow = 'unset';
                         if (response.data.message.includes("Someone Logged In")) {
                             setTimeout(() => {
@@ -539,8 +539,9 @@ export default class TaxPlanningMR extends Component {
                                 })
                                 anjay.push(totalShldBeNil)
                             } else if (String(item).includes('[M-1]')) {
-                                let tst = String(item).replace('[M-1]', '')
-                                let data = tableMeta.columnIndex == 9 ? 20 : tableMeta.columnIndex - 1
+                                let tst = String(item).replace('[M-1]', '[M1]')
+                                // let data = tableMeta.columnIndex == 9 ? 20 : tableMeta.columnIndex - 1
+                                let data = tableMeta.columnIndex
                                 let dataSub = dex == 1 ? tableMeta.rowData[data].tbc : dex == 2 ? tableMeta.rowData[data].fcp : tableMeta.rowData[data].tbf
                                 let period = data == 20 ? Number(this.props.periode) - 1 : this.props.periode
                                 let indexID = dataSub.formula.findIndex((val) => val.item_formula == String(`@${tst}`) && val.periode == period)