Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/api/index.js

@@ -272,7 +272,8 @@ const create = (type = "") => {
   const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body)
   const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
-
+  const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -487,7 +488,9 @@ const create = (type = "") => {
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
     uploadMonthlyReportPL,
-    getMonthlyReport
+    getMonthlyReport,
+    checkUploadMonthlyReportBS,
+    uploadMonthlyReportBS
   }
 }
 

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -666,7 +666,8 @@ export default class FixedAssetsMovement extends Component {
                 if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
                     let indexID = dataTable2.findIndex((val, index) => String(val[5]).toLocaleLowerCase() == 'ending balance' && dataTable2[index-1][2] == tableMeta.rowData[2])
                     if (indexID !== -1) {
-                        total = dataTable2[indexID][18].value
+                        // console.log(dataTable2)
+                        total = tableMeta.columnIndex == 21? dataTable2[indexID][20] : dataTable2[indexID][18].value
                     }
                 } else {
                     let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)

src/container/BudgetTahunan/TaxPlanning.js

@@ -946,8 +946,14 @@ 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
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
+                    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
@@ -1135,15 +1141,15 @@ export default class TaxPlanning extends Component {
             }
 
             total = R.equals(total, NaN) ? "0.0" : total
-            // console.log(tableMeta.rowData[8])
-            // if (xntd !== undefined && tableMeta.rowData[8] == "Under payment  /(Over Payment ) Income Tax Art.  29") {
+            // if (tableMeta.rowData[8] == "Corporate Income Tax") {
             //     console.log(tableMeta.rowData[8])
-            //     // console.log(splitFormula)
-            //     console.log(xntd)
-            //     console.log(baru)
-            //     console.log(anjay)
-            //     console.log(total)
-            //     console.log(total2)
+            //             // console.log(splitFormula)
+            //             console.log(xntd)
+            //             console.log(baru)
+            //             console.log(anjay)
+            //             console.log(total)
+            //             console.log(total2)
+            //     }
             //     console.log(opt)
             // }
 
@@ -1164,7 +1170,17 @@ 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 (total < 0) {
+                            total = 0
+                            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
+                        } else {
+                            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(2)
+                        }
+                    } else {
+                        dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1)
+
+                    }
                 }
             }
 
@@ -1203,9 +1219,20 @@ 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 (total < 0) {
+                            total = 0
+                            dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total)
+                        } 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
+                    dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total)
+
                 }
             }
 
@@ -1213,6 +1240,7 @@ export default class TaxPlanning extends Component {
         }
 
         const handleChange = (value, tableMeta, indexChilds) => {
+            // console.log(dataTable2)
             let val = String(value).split(",").join("")
             // let data = this.state.dataTable2
             let indexParent = dataTable2.findIndex((val) => val[4] === dataTable2[tableMeta.rowIndex][5])
@@ -8207,7 +8235,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 +8252,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>
                                                                             :