Merge branch 'didam' into 'master'

tinggal deni

See merge request !504

src/container/BudgetTahunan.js

@@ -755,9 +755,9 @@ export default class BudgetTahunan extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
-                                        tableMeta.rowData[5] == true ?
+                                        // tableMeta.rowData[5] == true ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                            : null
+                                            // : null
                                     }
                                 >
                                     {/* {this.state.isApprover == true ? 

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -311,18 +311,18 @@ export default class FixedAssetsMovement extends Component {
                             item.level,
                             item.item_report,
                             item.total_actual_before,
-                            item.january,
-                            item.february,
-                            item.march,
-                            item.april,
-                            item.may,
-                            item.june,
-                            item.july,
-                            item.august,
-                            item.september,
-                            item.october,
-                            item.november,
-                            item.december,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.january, formula: item.january_formula} : item.january,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.february, formula: item.february_formula} : item.february,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.march, formula: item.march_formula} : item.march,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.april, formula: item.april_formula} : item.april,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.may, formula: item.may_formula} : item.may,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.june, formula: item.june_formula} : item.june,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.july, formula: item.july_formula} : item.july,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.august, formula: item.august_formula} : item.august,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.september, formula: item.september_formula} : item.september,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.october, formula: item.october_formula} : item.october,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.november, formula: item.november_formula} : item.november,
+                            item.type_report_id == 5 || item.type_report_id == 6? {value: item.december, formula: item.december_formula} : item.december,
                             item.total_current_year,
                             item.total_next_year,
                             item.total_more_year,
@@ -542,11 +542,11 @@ export default class FixedAssetsMovement extends Component {
                     }
                 }
             })
-            console.log(dataTable2[tableMeta.rowIndex][22])
-            console.log(tableMeta.rowData[5])
-            console.log(baru)
-            console.log(anjay)
-            console.log(total)
+            // console.log(dataTable2[tableMeta.rowIndex][22])
+            // console.log(tableMeta.rowData[5])
+            // console.log(baru)
+            // console.log(anjay)
+            // console.log(total)
             
             if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {
                 // console.log([tableMeta.rowIndex][tableMeta.columnIndex])