Commit 1fc0700d authored by Riri Novita's avatar Riri Novita

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

Issue RO & OLPA Cash at the beginning

See merge request !1714
parents 1e34ff86 a6449ec4
...@@ -718,8 +718,16 @@ export default class CashFlow extends Component { ...@@ -718,8 +718,16 @@ export default class CashFlow extends Component {
} }
}) })
dataTable2[tableMeta.rowIndex][18] = total if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "cash at the beginning period") {
return total 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); // console.log(total);
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment