Skip to content

Commit 3abc478

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ortools_build
2 parents 1700983 + 4bbde69 commit 3abc478

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

deploy/runtime/ui/Financial Analysis Host Developer Parameters.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,7 @@
864864
" property('analysis_period_warning','caption',txt);",
865865
" refresh();\r",
866866
" change_tax_array_length();\r",
867-
" change_depreciation_length();\r",
868-
" change_curtailment_price_length();",
867+
" change_depreciation_length();",
869868
"};",
870869
""
871870
]

deploy/runtime/ui/Financial Analysis Parameters.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,12 @@
632632
" txt = analysis_period_message();",
633633
" property('analysis_period_warning','caption',txt);\r",
634634
" change_tax_array_length();\r",
635-
" change_curtailment_price_length();\r",
636-
" change_depreciation_length();",
635+
" if ( financing() == 'Single Owner') {\r",
636+
"\tchange_curtailment_price_length();\r",
637+
" }\r",
638+
" if (financing() != 'Residential' && financing() != 'LCOE Calculator' && financing() != 'None') {\r",
639+
"\tchange_depreciation_length();\r",
640+
" }",
637641
"};",
638642
""
639643
]

0 commit comments

Comments
 (0)