Merge branch 'rifka' into 'master'

jadi nama

See merge request !660

src/container/BudgetTahunan/TaxPlanning.js

@@ -125,7 +125,7 @@ export default class TaxPlanning extends Component {
             "submission_id": this.props.submissionID
         }
         api.create().getDetailReportMB(payload).then(response => {
-            console.log(response);
+            // console.log(response);
             let dataTable = []
             if (response.data) {
                 if (response.data.status == 'success') {
@@ -817,7 +817,7 @@ export default class TaxPlanning extends Component {
                             let indexID = dataTable2.findIndex((val) => val[24] == splitform[0])
                             if (indexID !== -1) {
                                 let data = dataTable2[indexID][20].fcp
-                                console.log(dataTable2[indexID][20]);
+                                // console.log(dataTable2[indexID][20]);
                                 // let data = splitform[1] == 'TP1' ? dataTable2[indexID][tableMeta.columnIndex].tbc : splitform[1] == 'TP2' ? dataTable2[indexID][tableMeta.columnIndex].fcp : dataTable2[indexID][tableMeta.columnIndex].tbf
                                 // let valuezz = data.value == undefined ? data : data.value
                                 anjay.push(data == "" ? 0 : data)
@@ -7453,12 +7453,12 @@ export default class TaxPlanning extends Component {
                             <div className="grid grid-3x content-center">
                                 {/* <div className="col-1"> */}
                                 <div style={{ textAlign: 'right' }}>
-                                    {tableMeta.rowData[24] === 81 ||
-                                        tableMeta.rowData[24] === 88 ||
-                                        tableMeta.rowData[24] === 92 ||
-                                        tableMeta.rowData[24] === 93 ||
-                                        tableMeta.rowData[24] === 94 ||
-                                        tableMeta.rowData[24] === 95
+                                    {tableMeta.rowData[8] == "Tax Loss Carry Forward" ||
+                                        tableMeta.rowData[8] === "Adjustment" ||
+                                        tableMeta.rowData[8] === "Inc Tax Art 22" ||
+                                        tableMeta.rowData[8] === "Inc Tax Art 23" ||
+                                        tableMeta.rowData[8] === "Inc Tax Art 24" ||
+                                        tableMeta.rowData[8] === "Inc Tax Art 25"
                                         ?
                                         <div style={{ flex: 1 }}>
                                             <FormControlLabel