Commit da7cc423 authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

load

See merge request !958
parents 0ee10887 7922850e
...@@ -1322,7 +1322,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1322,7 +1322,7 @@ export default class FixedAssetsMovementMR extends Component {
</div> </div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{!this.state.loading && !this.state.refresh && ( {!this.state.refresh && (
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment