Skip to content

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

Merge branch 'dev/riri' into 'ENV-DEV' 

Update DB BS & DB PL

See merge request !2020
parents c39f1bda 49b8a7ef
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 246 deletions
src/container/Reports/SubHolding.js
View file @ 9e5e05ec
...@@ -841,21 +841,21 @@ export default class SubHolding extends Component { ...@@ -841,21 +841,21 @@ export default class SubHolding extends Component {
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
Number(item.balance_sheet.january).toFixed(1), Number(item.balance_sheet.january),
Number(item.balance_sheet.february).toFixed(1), Number(item.balance_sheet.february),
Number(item.balance_sheet.march).toFixed(1), Number(item.balance_sheet.march),
Number(item.balance_sheet.april).toFixed(1), Number(item.balance_sheet.april),
Number(item.balance_sheet.may).toFixed(1), Number(item.balance_sheet.may),
Number(item.balance_sheet.june).toFixed(1), Number(item.balance_sheet.june),
Number(item.balance_sheet.july).toFixed(1), Number(item.balance_sheet.july),
Number(item.balance_sheet.august).toFixed(1), Number(item.balance_sheet.august),
Number(item.balance_sheet.september).toFixed(1), Number(item.balance_sheet.september),
Number(item.balance_sheet.october).toFixed(1), Number(item.balance_sheet.october),
Number(item.balance_sheet.november).toFixed(1), Number(item.balance_sheet.november),
Number(item.balance_sheet.december).toFixed(1), Number(item.balance_sheet.december),
Number(item.balance_sheet.total_current_year).toFixed(1), Number(item.balance_sheet.total_current_year),
Number(item.balance_sheet.total_next_year).toFixed(1), Number(item.balance_sheet.total_next_year),
Number(item.balance_sheet.total_more_year).toFixed(1), Number(item.balance_sheet.total_more_year),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
...@@ -975,21 +975,21 @@ export default class SubHolding extends Component { ...@@ -975,21 +975,21 @@ export default class SubHolding extends Component {
item.level, item.level,
item.description, item.description,
item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before, item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before,
Number(item.balance_sheet.january).toFixed(1), Number(item.balance_sheet.january),
Number(item.balance_sheet.february).toFixed(1), Number(item.balance_sheet.february),
Number(item.balance_sheet.march).toFixed(1), Number(item.balance_sheet.march),
Number(item.balance_sheet.april).toFixed(1), Number(item.balance_sheet.april),
Number(item.balance_sheet.may).toFixed(1), Number(item.balance_sheet.may),
Number(item.balance_sheet.june).toFixed(1), Number(item.balance_sheet.june),
Number(item.balance_sheet.july).toFixed(1), Number(item.balance_sheet.july),
Number(item.balance_sheet.august).toFixed(1), Number(item.balance_sheet.august),
Number(item.balance_sheet.september).toFixed(1), Number(item.balance_sheet.september),
Number(item.balance_sheet.october).toFixed(1), Number(item.balance_sheet.october),
Number(item.balance_sheet.november).toFixed(1), Number(item.balance_sheet.november),
Number(item.balance_sheet.december).toFixed(1), Number(item.balance_sheet.december),
Number(item.balance_sheet.total_current_year).toFixed(1), Number(item.balance_sheet.total_current_year),
Number(item.balance_sheet.total_next_year).toFixed(1), Number(item.balance_sheet.total_next_year),
Number(item.balance_sheet.total_more_year).toFixed(1), Number(item.balance_sheet.total_more_year),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
......
src/container/Reports/TableSubHolding.js
View file @ 9e5e05ec
This source diff could not be displayed because it is too large. You can view the blob instead.
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