Merge branch 'faisal' into 'master'

loading

See merge request !947

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -201,7 +201,7 @@ export default class FixedAssetsMovementMR extends Component {
                         }
                     })
                     console.log(dataTable);
-                    this.setState({ dataTable, loading: false, refresh: false })
+                    this.setState({ dataTable, loading: false })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
                         if (response.data.message.includes("Someone Logged In")) {
@@ -213,7 +213,7 @@ export default class FixedAssetsMovementMR extends Component {
                     })
                 }                
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, refresh: false })
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -1314,7 +1314,7 @@ export default class FixedAssetsMovementMR extends Component {
                                 </div>
 
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                    {!this.state.refresh && (
+                                    {!this.state.loading && (
                                         <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}