Merge branch 'didam' into 'master'

Didam

See merge request !928

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -1480,10 +1480,10 @@ export default class CorporateAnnualTargetMR extends Component {
                                             style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                             type="text"
                                             placeholder=""
-                                            value={Number(value).toFixed(1)}
+                                            value={Number(value).toFixed(0)}
                                             // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
                                             disabled={true}
-                                            decimalScale={1}
+                                            decimalScale={0}
                                         />
                                     :
                                     <FormControlLabel