Merge branch 'dev/riri' into 'ENV-DEV'

Issue RO & OLPA Cash at the beginning

See merge request !1713

src/container/OutlookPA/CashFlowOLPA.js

@@ -718,8 +718,16 @@ export default class CashFlow extends Component {
                 }
             })
 
+            if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "cash at the beginning period") {
+                let totalBeginning = dataTable2[tableMeta.rowIndex][18] = dataTable2[tableMeta.rowIndex][6].value
+                return totalBeginning
+            }else if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "cash at the end of the period") {
+                let totalEnd = dataTable2[tableMeta.rowIndex][18] = dataTable2[tableMeta.rowIndex][17].value
+                return totalEnd
+            } else {
                 dataTable2[tableMeta.rowIndex][18] = total
                 return total
+            }
             // console.log(total);
         }