Merge branch 'faisal' into 'master'

checkupload bs ro!

See merge request !1467

src/container/RollingOutlook/BalanceSheetRO.js

@@ -512,22 +512,23 @@ export default class BalanceSheetRO extends Component {
                             item.level,
                             item.item_report,
                             item.total_december_last_year === "" ? "0" : item.total_december_last_year,
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.january, formula: item.january_formula } : Number(item.january).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.february, formula: item.february_formula } : Number(item.february).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.march, formula: item.march_formula } : Number(item.march).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.april, formula: item.april_formula } : Number(item.april).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.may, formula: item.may_formula } : Number(item.may).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.june, formula: item.june_formula } : Number(item.june).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.july, formula: item.july_formula } : Number(item.july).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.august, formula: item.august_formula } : Number(item.august).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.september, formula: item.september_formula } : Number(item.september).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.october, formula: item.october_formula } : Number(item.october).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.november, formula: item.november_formula } : Number(item.november).toFixed(1),
-                            String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.december, formula: item.december_formula } : Number(item.december).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : Number(item.january).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : Number(item.february).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : Number(item.march).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : Number(item.april).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : Number(item.may).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : Number(item.june).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : Number(item.july).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : Number(item.august).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : Number(item.september).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : Number(item.october).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : Number(item.november).toFixed(1),
+                            item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : Number(item.december).toFixed(1),
                             item.total_december_year === "" ? "0" : item.total_december_year,
                             item.order,
                             item.condition_it_should_be,
-                            item.condition_if_wrong
+                            item.condition_if_wrong,
+                            item.forecast_formula == null ? [] : item.forecast_formula
                         ]
                     })
                     console.log(dataTable)