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

src/container/BudgetTahunan.js

@@ -762,7 +762,7 @@ export default class BudgetTahunan extends Component {
                     })    
                 }
             } else {
-                this.setState({ alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error', loading: false }, () => {
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false }, () => {
                     this.getSubmission()
                     document.body.style.overflow = 'unset';
                 })

src/container/BudgetTahunan/BalanceSheet.js

@@ -442,7 +442,7 @@ export default class BalanceSheet extends Component {
                     })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -670,7 +670,7 @@ export default class CorporateAnnualTarget extends Component {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -447,7 +447,7 @@ export default class FixedAssetsMovement extends Component {
             } else {
                 // this.setState({ loading: false })
                 // alert(response.problem)
-                this.setState({ alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/ProfitLoss.js

@@ -447,7 +447,7 @@ export default class ProfitLoss extends Component {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/TaxPlanning.js

@@ -632,7 +632,7 @@ export default class TaxPlanning extends Component {
                     // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false, alert: true, messageAlert: 'Data is not saved, please check your Connection', tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error' })
             }
         })
     }

src/container/MonthlyReport/BalanceSheetMR.js

@@ -430,6 +430,7 @@ export default class BalanceSheetMR extends Component {
         }
         api.create('UPLOAD').createMonthlyReportBS(payload).then(response => {
             console.log(response);
+            console.log(JSON.stringify(payload))
             if (response.data) {
                 if (response.data.status === "success") {
                     this.props.saveToMonthlyReport()

src/container/MonthlyReport/TaxPlanningMR.js

@@ -113,7 +113,8 @@ export default class TaxPlanningMR extends Component {
             "periode": this.props.periode,
             "company_id": this.props.company.company_id,
             "monthly_report_id": this.props.monthlyReportId,
-            "months": this.props.month.month_id
+            "months": this.props.month.month_id,
+            "get_for": "edit"
         }
         api.create().getHierarkiMontlyReportTP(payload).then(response => {
             console.log(response);
@@ -1526,7 +1527,7 @@ export default class TaxPlanningMR extends Component {
                                             // disabled={this.state.buttonError}
                                             onClick={() => 
                                                 this.state.buttonError ?
-                                                    this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
+                                                    this.setState({ alert: true, messageAlert: 'Data incomplete', tipeAlert: 'warning' })
                                                     :
                                                     this.state.handleTekTekTek == 1 ? null :
                                                         this.setState({ handleTekTekTek: 1, loading: true }, () => {