Merge branch 'rifka' into 'master'

issue tp ro

See merge request !1390

src/container/RollingOutlook/TaxPlanningRO.js

@@ -1029,12 +1029,25 @@ export default class TaxPlanning extends Component {
                 } else {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = Number(total).toFixed(1)
                 }
+            } else if (dex == 3) {
+                if (tableMeta.rowData[8] == "Corporate Income Tax") {
+                    if (total < 0) {
+                        total = 0
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
                     } else {
-                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
+                    }
+                } else if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1)
                 } else {
                     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
                 }
+            } else {
+                if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total).toFixed(1)
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(total).toFixed(1)
+                }
             }
 
             return Number(total).toFixed(1)