Skip to content

T
Tia-dev
Commit 9e1570b5 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

parents 3854bb9f 6b56e99d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/container/Laporan/SubHolding.js
View file @ 9e1570b5
......@@ -1100,7 +1100,7 @@ export default class SubHolding extends Component {
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
item.tax_planning_report.total_current_year,
item.tax_planning_report.monthly_full_year,
])
}
if (item.children !== null) {
......@@ -1150,7 +1150,7 @@ export default class SubHolding extends Component {
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
item.tax_planning_report.total_current_year,
item.tax_planning_report.monthly_full_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......
src/container/Laporan/TableSubHolding.js
View file @ 9e1570b5
......@@ -14787,7 +14787,7 @@ export default class TableSubHolding extends Component {
control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
......@@ -14832,7 +14832,7 @@ export default class TableSubHolding extends Component {
control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ color: this.props.approvedMB ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
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