Merge branch 'didam' into 'master'

Didam

See merge request !1051

src/container/MonthlyReport/BalanceSheetMR.js

@@ -434,7 +434,7 @@ export default class BalanceSheetMR extends Component {
         this.state.dataTable.map(i => {
             data.push({
                 item_report_id: i[1],
-                item_report: String(i[5]).trim(),
+                item_report: String(i[5]),
                 rolling_outlook: i[0] === 5 || i[0] === 6 ? String(Number(i[6]).toFixed(1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6]).toFixed(1)),
                 master_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[7]).toFixed(1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7]).toFixed(1)),
                 rolling_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[8]).toFixed(1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8]).toFixed(1)),
@@ -497,16 +497,16 @@ export default class BalanceSheetMR extends Component {
         this.state.dataTable.map(i => {
             data.push({
                 "item_report_id": i[1],
-                "rolling_outlook": i[6],
-                "master_budget": i[7],
-                "rolling_budget": i[8],
-                "actual": i[9],
-                "actual_previous_month": i[10],
-                "amount_act_vs_previous_month": i[11],
-                "percent_act_vs_previous_month": i[12],
-                "amount_act_vs_mb": i[13],
+                "rolling_outlook": String(Number(i[6]).toFixed(1)),
+                "master_budget": String(Number(i[7]).toFixed(1)),
+                "rolling_budget": String(Number(i[8]).toFixed(1)),
+                "actual": String(Number(i[9]).toFixed(1)),
+                "actual_previous_month": String(Number(i[10]).toFixed(1)),
+                "amount_act_vs_previous_month": String(Number(i[11]).toFixed(1)),
+                "percent_act_vs_previous_month": String(Number(i[12]).toFixed(1)),
+                "amount_act_vs_mb": String(Number(i[13]).toFixed(1)),
                 "percent_act_vs_mb": i[14],
-                "amount_act_vs_rb": i[15],
+                "amount_act_vs_rb": String(Number(i[15]).toFixed(1)),
                 "percent_act_vs_rb": i[16],
                 "mtd_vs_previous_month": i[17],
                 "mtd_vs_mb": i[18],