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

src/container/Laporan/SubHolding.js

@@ -1364,13 +1364,13 @@ export default class SubHolding extends Component {
                                 item.formula,
                                 item.level,
                                 item.description,
-                                item.balance_sheet.last_month,
+                                item.balance_sheet.mtd_last_month,
                                 item.balance_sheet.mtd_actual,
                                 item.balance_sheet.mtd_mb,
                                 item.balance_sheet.percent_of_mb,
                                 item.balance_sheet.mtd_ol,
                                 item.balance_sheet.percent_of_ol,
-                                item.balance_sheet.last_year,
+                                item.balance_sheet.mtd_last_year,
                                 item.balance_sheet.forecast_next_year,
                                 item.balance_sheet.forecast_more_year,
                                 item.order
@@ -1392,7 +1392,7 @@ export default class SubHolding extends Component {
                             item.formula,
                             item.level,
                             item.description,
-                            item.balance_sheet.last_month,
+                            item.balance_sheet.mtd_last_month,
                             item.balance_sheet.mtd_actual,
                             item.balance_sheet.mtd_mb,
                             item.balance_sheet.percent_of_mb,
@@ -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) {