Skip to content

T
Tia-dev
Commit ad5fb4b5 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

Riri

See merge request !1455
parents 58d3c587 6b3cf421
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 54 deletions
src/container/Laporan/SubHolding.js
View file @ ad5fb4b5
......@@ -569,16 +569,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
// item.profit_loss.historialLast10YearList,
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
])
}
......@@ -701,16 +701,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
// item.profit_loss.historialLast10YearList
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -864,16 +864,16 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december,
// item.balance_sheet.historial_last_10_years_list,
item.balance_sheet.history_current_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_nine_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_nine_year
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_current_year,
])
......@@ -998,16 +998,17 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december,
// item.balance_sheet.historial_last_10_years_list
item.balance_sheet.history_current_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_nine_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_nine_year
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_current_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -1177,16 +1178,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
])
if (item.children !== null) {
......@@ -1311,16 +1312,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december,
item.profit_loss.history_current_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
])
if (item.children !== null) {
if (item.children.length > 0) {
......
src/container/Laporan/TableSubHolding.js
View file @ ad5fb4b5
......@@ -4934,6 +4934,41 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}
]
......@@ -8740,6 +8775,46 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}
]
......@@ -12530,6 +12605,46 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}
]
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