Skip to content

T
Tia-dev
Commit 2ec2a53c authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-STAGING' into 'ENV-PROD' 

Env staging

See merge request !2380
parents 7c361de8 c380b498
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/container/BudgetTahunan/CashFlow.js
View file @ 2ec2a53c
......@@ -3097,9 +3097,9 @@ export default class CashFlow extends Component {
type="text"
placeholder=""
disabled={true}
// value={Number(handleFYTotal(tableMeta)).toFixed(1)}
value={Number(handleFYTotal(tableMeta)).toFixed(1)}
// value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleForecast(tableMeta, `${Number(this.props.periode) + 1}`, 20)), 1) : Number(handleForecast(tableMeta, `${Number(this.props.periode) + 1}`, 20))}
value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)}
// value={fixNumber(Number(value), 1) == 0 ? "0.0" : fixNumber(Number(value), 1)}
/>
}
/>
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 2ec2a53c
......@@ -3863,9 +3863,9 @@ export default class CorporateAnnualTarget extends Component {
<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})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ width: '50%' }}>
......@@ -4052,9 +4052,9 @@ export default class CorporateAnnualTarget extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode}</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
{this.state.dataLoaded && (
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 2ec2a53c
......@@ -2050,9 +2050,9 @@ export default class CorporateAnnualTargetMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ width: '50%' }}>
......@@ -2291,9 +2291,9 @@ export default class CorporateAnnualTargetMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ 2ec2a53c
......@@ -709,7 +709,7 @@ export default class BalanceSheetRO extends Component {
const handleChange = (value, tableMeta, type) => {
let val = String(value).split(",").join("")
if (type === "actual") {
console.log('masuk')
console.log('masuk')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} else {
console.log('masuk2')
......
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