Merge branch 'rifka' into 'master'

issue tp ro

See merge request !1445

src/container/RollingOutlook/TaxPlanningRO.js

@@ -748,7 +748,7 @@ export default class TaxPlanning extends Component {
             if (String(i[8]) == "Control (should be nil)") {
                 this.setState({ loading: true })
                 let n = 0
-                for (n = 12; n <= 20; n++) {
+                for ( n = (this.props.quarter == 'q1' ? 12 : (this.props.quarter == 'q2' ? 15 : 18)) ; n <= 20; n++) {
                     if ((Number(i[n].tbf.value) < Number(this.state.minValue) || Number(i[n].tbf.value) > Number(this.state.maxValue))) {
                         errorContrl = true
                         editAble = true
@@ -1031,12 +1031,12 @@ export default class TaxPlanning extends Component {
                 }
             } 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 {
-                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2)
-                    }
+                    // if (total < 0) {
+                    //     total = 0
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total < 0 ? 0 : total).toFixed(2)
+                    // } else {
+                    //     dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = 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 {