From: Galen Charlton Date: Wed, 2 Jun 2021 21:05:14 +0000 (-0400) Subject: funds: conditionally display the "Limit Fiscal Year Close-Out to Encumbrance" checkbox X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3e5b8ba9f7015349ba879f29165b4827ca4db66b;p=working%2FEvergreen.git funds: conditionally display the "Limit Fiscal Year Close-Out to Encumbrance" checkbox This now displays only when the Limit Fiscal Year Close-Out to Encumbrances library setting is active. LH#20, LH#53 Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html index 1850ea15fc..c22132a8d9 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html @@ -41,7 +41,7 @@ Will do a Close-Out for real. If you need to double-check first, check the "Dry Run" checkbox. -
+
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts index 4aec6e54e9..ca5778be5d 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts @@ -38,6 +38,7 @@ export class FundRolloverDialogComponent includeDescendants = false; propagateFunds = false; doCloseout = false; + showEncumbOnly = false; limitToEncumbrances = false; dryRun = true; contextOrg: IdlObject; @@ -94,6 +95,10 @@ export class FundRolloverDialogComponent this.year = maxYear; } ); + this.showEncumbOnly = false; + this.org.settings('acq.fund.allow_rollover_without_money', this.contextOrgId).then((ous) => { + this.showEncumbOnly = ous['acq.fund.allow_rollover_without_money']; + }); } rollover() {