Merge branch 'deni-' into 'master'

submisionid = monthlyID

See merge request !771

src/container/MonthlyReport/BalanceSheetMR.js

@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component {
             })
         })
         let body = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component {
             })
         })
         let payload = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component {
                     })
                 }
             } else {
-                this.setState({ loading: false }, () => {
-                    this.getSubmission()
-                    document.body.style.overflow = 'unset';
-                })
+                this.setState({ loading: false })
             }
         })
     }

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -312,7 +312,7 @@ export default class FixedAssetsMovementMR extends Component {
             })
         })
         let body = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
@@ -363,7 +363,7 @@ export default class FixedAssetsMovementMR extends Component {
             })
         })   
         let payload = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,