Merge branch 'GGMAC' into 'master'

update

See merge request !1469

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -788,7 +788,12 @@ export default class BalanceSheetOLPA extends Component {
 
         const handleForecast = (tableMeta, periode, column) => {
             let total = 0
-            total = handleValueFormula(dataTable2[tableMeta.rowIndex][column], tableMeta, column, periode, dataTable2[tableMeta.rowIndex][23])
+            if (column == 19 && String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)") {
+                total = tableMeta.rowData[7]
+                dataTable2[tableMeta.rowIndex][column] = tableMeta.rowData[7]
+            } else {
+                total = handleValueFormula(dataTable2[tableMeta.rowIndex][column], tableMeta, column, periode, dataTable2[tableMeta.rowIndex][23])
+            }
             // console.log(total)
             return total
         }