Commit 3768511f authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

RE condition!

See merge request !1116
parents 66601308 1e923c49
...@@ -968,9 +968,9 @@ export default class BalanceSheet extends Component { ...@@ -968,9 +968,9 @@ export default class BalanceSheet extends Component {
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? false : true }
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? Number(value).toFixed(1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 5 ? tableMeta.rowData[0] === 5 ?
...@@ -979,9 +979,9 @@ export default class BalanceSheet extends Component { ...@@ -979,9 +979,9 @@ export default class BalanceSheet extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? false : true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={String(tableMeta.rowData[5]).toLocaleLowerCase() == "r/e (cummulative)" ? Number(value).toFixed(1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
null null
......
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