Merge branch 'rifka' into 'master'

issue tp 15 16

See merge request !718

src/container/BudgetTahunan/TaxPlanning.js

@@ -946,8 +946,13 @@ export default class TaxPlanning extends Component {
             // console.log(tableMeta.rowData[8], baru, anjay, total);
             if (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX") {
                 total = R.equals(total, NaN) ? "0.00" : Number(total).toFixed(2)
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
-                return total
+                if (total < 0) {
+                    total = 0
+                    return total
+                } else {
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
+                    return total
+                }
             } else {
                 total = R.equals(total, NaN) ? "0.0" : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
@@ -1164,7 +1169,16 @@ export default class TaxPlanning extends Component {
                 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)
+                    if (tableMeta.rowData[8] == "Corporate Income Tax") {
+                        if (Number(dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value) < 0) {
+                            total = 0
+                        } else {
+                            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
+                        }
+                    } else {
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
+
+                    }
                 }
             }
 
@@ -1203,9 +1217,27 @@ export default class TaxPlanning extends Component {
                 }
             } else {
                 if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
-                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
+                    if (tableMeta.rowData[8] == "Corporate Income Tax") {
+                        if (Number(dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf) < 0) {
+                            total = 0
+                        } else {
+                            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total)
+                        }
+                    } else {
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total)
+
+                    }
                 } else {
-                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = total
+                    if (tableMeta.rowData[8] == "Corporate Income Tax") {
+                        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)
+
+                    }
                 }
             }
 
@@ -8207,7 +8239,7 @@ export default class TaxPlanning extends Component {
                                                                                     type="text"
                                                                                     placeholder=""
                                                                                     disabled={true}
-                                                                                    value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
+                                                                                    value={Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1)}
                                                                                 /> :
                                                                                 <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
                                                                                     <NumberFormat
@@ -8224,7 +8256,7 @@ export default class TaxPlanning extends Component {
                                                                                         type="text"
                                                                                         placeholder=""
                                                                                         disabled={true}
-                                                                                        value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
+                                                                                        value={Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1)}
                                                                                     />
                                                                                 </LightTooltip>
                                                                             :