Merge branch 'dev/riri' into 'ENV-DEV'

Update MR

See merge request !2055

src/container/MonthlyReport/CashFlowMR.js

@@ -610,7 +610,7 @@ export default class CashFlowMR extends Component {
                                             type="text"
                                             placeholder=""
                                             disabled={true}
-                                            value={this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)) : this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
+                                            value={this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)) : this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) == 0 ? "0.0" : Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6)) == 0 ? "0.0" : Number(handleValueFormula(tableMeta, 6))}
                                         />
                                     </span>
                                     :

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -1755,7 +1755,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                                         style={{ color: this.state.get_for == 'view' ? "black" : handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta) ? "#5198ea" : 'black', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                         type="text"
                                                         placeholder=""
-                                                        value={Number(value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? fixNumber(Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)), 1) : fixNumber(Number(value), 1)) : (tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)) : Number(value))}
+                                                        value={this.props.defaultCurrency.id == 1 ? (tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? fixNumber(Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)), 1) : fixNumber(Number(value), 1)) : (tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? (Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex))) : Number(value) == 0 ? "0.0" : Number(value))}
                                                         // 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={this.state.get_for == 'view' ? true : !handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta)}
                                                         decimalScale={1}