Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Issue OI

See merge request !2342

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -658,7 +658,7 @@ export default class OperatingIndicatorMR extends Component {
             let total = 0
             dataTable2.map((item, index) => {
                 if (data.rowData[1] === item[2]) {
-                    let itemVal = item[data.columnIndex + type].value !== undefined ? Number(item[data.columnIndex + type].value) : Number(item[data.columnIndex + type])
+                    let itemVal = item[data.columnIndex + type]?.value !== undefined ? Number(item[data.columnIndex + type]?.value) : Number(item[data.columnIndex + type])
                     total = item[data.columnIndex + type] === undefined ? Number(total) + 0 : Number(total) + itemVal
                 }
             })