Commit 8ab8a8aa authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'rifka' into 'master'

lagi

See merge request !720
parents 699fb585 05c77893
...@@ -948,6 +948,7 @@ export default class TaxPlanning extends Component { ...@@ -948,6 +948,7 @@ export default class TaxPlanning extends Component {
total = R.equals(total, NaN) ? "0.00" : Number(total).toFixed(2) total = R.equals(total, NaN) ? "0.00" : Number(total).toFixed(2)
if (total < 0) { if (total < 0) {
total = 0 total = 0
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
return total return total
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
...@@ -1219,8 +1220,9 @@ export default class TaxPlanning extends Component { ...@@ -1219,8 +1220,9 @@ export default class TaxPlanning extends Component {
} else { } else {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
if (tableMeta.rowData[8] == "Corporate Income Tax") { if (tableMeta.rowData[8] == "Corporate Income Tax") {
if (Number(dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf) < 0) { if (total < 0) {
total = 0 total = 0
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total)
} }
...@@ -1229,16 +1231,8 @@ export default class TaxPlanning extends Component { ...@@ -1229,16 +1231,8 @@ export default class TaxPlanning extends Component {
} }
} else { } else {
if (tableMeta.rowData[8] == "Corporate Income Tax") { dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total)
if (Number(dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value) < 0) {
total = 0
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total)
}
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total)
}
} }
} }
......
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