Merge branch 'riri' into 'master'

summary pl apdet

See merge request !1068

src/container/Laporan/SubHolding.js

@@ -1555,6 +1555,9 @@ export default class SubHolding extends Component {
                                 item.profit_loss.fy_last_year,
                                 isNaN(persenFyLY) || persenFyLY == 'Infinity' || persenFyLY == '-Infinity'? (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? -0 : 0) : (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? persenFyLY * -100 : persenFyLY * 100),
                                 isNaN(persenFyOLMB) || persenFyOLMB == 'Infinity' || persenFyOLMB == '-Infinity'? (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? -0 : 0) : (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? persenFyOLMB * -100 : persenFyOLMB * 100),
+                                item.profit_loss.forecast_next_year,
+                                item.profit_loss.forecast_more_year,
+                                item.profit_loss.notes,
                             ])
                             if (item.children !== null) {
                                 if (item.children.length > 0) {