Commit acc6458b authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

issue bsro!

See merge request !1355
parents bb5ed288 45dd3086
...@@ -1079,7 +1079,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1079,7 +1079,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1096,7 +1096,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1096,7 +1096,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1111,7 +1111,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1111,7 +1111,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(val).toFixed(1)} value={val == 0 ? "" : Number(val).toFixed(1)}
/> />
} }
/> />
...@@ -1210,7 +1210,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1210,7 +1210,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 7)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 7)).toFixed(1)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1227,7 +1227,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1227,7 +1227,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 7)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 7)).toFixed(1)}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1242,7 +1242,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1242,7 +1242,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(val).toFixed(1)} value={val == 0 ? "" : Number(val).toFixed(1)}
/> />
} }
/> />
...@@ -1341,7 +1341,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1341,7 +1341,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 8)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 8)).toFixed(1)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1358,7 +1358,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1358,7 +1358,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 8)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 8)).toFixed(1)}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1373,7 +1373,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1373,7 +1373,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(val).toFixed(1)} value={val == 0 ? "" : Number(val).toFixed(1)}
/> />
} }
/> />
...@@ -1472,7 +1472,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1472,7 +1472,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 9)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 9)).toFixed(1)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[21]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1489,7 +1489,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1489,7 +1489,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(handleValueFormula(tableMeta, 9)).toFixed(1)} value={val == 0 ? "" : Number(handleValueFormula(tableMeta, 9)).toFixed(1)}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1504,7 +1504,7 @@ export default class BalanceSheetRO extends Component { ...@@ -1504,7 +1504,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={val === "0" ? "" : Number(val).toFixed(1)} value={val == 0 ? "" : Number(val).toFixed(1)}
/> />
} }
/> />
...@@ -2858,7 +2858,7 @@ export default class BalanceSheetRO extends Component { ...@@ -2858,7 +2858,7 @@ export default class BalanceSheetRO extends Component {
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div> <div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
...@@ -3087,7 +3087,7 @@ export default class BalanceSheetRO extends Component { ...@@ -3087,7 +3087,7 @@ export default class BalanceSheetRO extends Component {
<div style={{ display: 'flex', justifyContent: 'space-between' }}> <div style={{ display: 'flex', justifyContent: 'space-between' }}>
<div> <div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ width: '50%' }}/> <div style={{ width: '50%' }}/>
......
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