From b133a7eed62f36371fbb08f8e3474699f26f1f60 Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 16 Jul 2008 21:43:31 +0000 Subject: [PATCH] Typo: encumberance -> encumbrance (Might as well get it early) git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@10058 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/fm_IDL.xml | 6 +++--- Open-ILS/src/extras/ils_events.xml | 4 ++-- Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm | 6 +++--- Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm | 2 +- Open-ILS/src/sql/Pg/200.schema.acq.sql | 10 +++++----- .../oils/media/ui_js/oils/default/acq/financial/view_fund.js | 2 +- .../templates/oils/default/acq/financial/view_fund.html | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 2c41d5e601..2de1577552 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -3363,7 +3363,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -3421,13 +3421,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + - + diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml index 8394a02e09..0831442979 100644 --- a/Open-ILS/src/extras/ils_events.xml +++ b/Open-ILS/src/extras/ils_events.xml @@ -577,8 +577,8 @@ The requested acq.fund_allocation_total was not found - - The requested acq.fund_encumberance_total was not found + + The requested acq.fund_encumbrance_total was not found The requested acq.fund_spent_total was not found diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm index 2afd38cc1f..1dee711466 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm @@ -312,7 +312,7 @@ __PACKAGE__->register_method( method => 'retrieve_fund_summary', api_name => 'open-ils.acq.fund.summary.retrieve', signature => { - desc => 'Returns a summary of credits/debits/encumberances for a fund', + desc => 'Returns a summary of credits/debits/encumbrances for a fund', params => [ {desc => 'Authentication token', type => 'string'}, {desc => 'fund id', type => 'number' } @@ -336,7 +336,7 @@ sub retrieve_fund_summary_impl { my $at = $e->search_acq_fund_allocation_total({fund => $fund->id})->[0]; my $dt = $e->search_acq_fund_debit_total({fund => $fund->id})->[0]; - my $et = $e->search_acq_fund_encumberance_total({fund => $fund->id})->[0]; + my $et = $e->search_acq_fund_encumbrance_total({fund => $fund->id})->[0]; my $st = $e->search_acq_fund_spent_total({fund => $fund->id})->[0]; my $cb = $e->search_acq_fund_combined_balance({fund => $fund->id})->[0]; my $sb = $e->search_acq_fund_spent_balance({fund => $fund->id})->[0]; @@ -344,7 +344,7 @@ sub retrieve_fund_summary_impl { return { allocation_total => ($at) ? $at->amount : 0, debit_total => ($dt) ? $dt->amount : 0, - encumberance_total => ($et) ? $et->amount : 0, + encumbrance_total => ($et) ? $et->amount : 0, spent_total => ($st) ? $st->amount : 0, combined_balance => ($cb) ? $cb->amount : 0, spent_balance => ($sb) ? $sb->amount : 0, diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm index 47d7287ab9..65524a5127 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm @@ -644,7 +644,7 @@ sub receive_lineitem_detail_impl { $copy->editor($e->requestor->id); $e->update_asset_copy($copy) or return $e->die_event; - # XXX update the fund_debit to encumberance=false + # XXX update the fund_debit to encumbrance=false my $non_recv = $e->search_acq_lineitem_detail( {recv_time => undef, lineitem => $lid->lineitem}, {idlist=>1}); diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql index 2c24dc264b..668eff2ab3 100644 --- a/Open-ILS/src/sql/Pg/200.schema.acq.sql +++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql @@ -70,7 +70,7 @@ CREATE TABLE acq.fund_debit ( origin_amount NUMERIC NOT NULL, -- pre-exchange-rate amount origin_currency_type TEXT NOT NULL REFERENCES acq.currency_type (code), amount NUMERIC NOT NULL, - encumberance BOOL NOT NULL DEFAULT TRUE, + encumbrance BOOL NOT NULL DEFAULT TRUE, debit_type TEXT NOT NULL, xfer_destination INT REFERENCES acq.fund (id) ); @@ -375,23 +375,23 @@ CREATE OR REPLACE VIEW acq.fund_allocation_total AS CREATE OR REPLACE VIEW acq.fund_debit_total AS SELECT id AS fund, - encumberance, + encumbrance, SUM(amount) AS amount FROM acq.fund_debit GROUP BY 1,2; -CREATE OR REPLACE VIEW acq.fund_encumberance_total AS +CREATE OR REPLACE VIEW acq.fund_encumbrance_total AS SELECT fund, SUM(amount) AS amount FROM acq.fund_debit_total - WHERE encumberance IS TRUE + WHERE encumbrance IS TRUE GROUP BY 1; CREATE OR REPLACE VIEW acq.fund_spent_total AS SELECT fund, SUM(amount) AS amount FROM acq.fund_debit_total - WHERE encumberance IS FALSE + WHERE encumbrance IS FALSE GROUP BY 1; CREATE OR REPLACE VIEW acq.fund_combined_balance AS diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js index 517ca9acb3..661f4d1ca6 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js @@ -19,7 +19,7 @@ function getSummaryInfo(rowIndex) { case 6: return new String(fund.summary().spent_balance); case 7: return new String(fund.summary().debit_total); case 8: return new String(fund.summary().spent_total); - case 9: return new String(fund.summary().encumberance_total); + case 9: return new String(fund.summary().encumbrance_total); } } diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html index a2fa556800..702ac8236c 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html @@ -93,7 +93,7 @@ {name: '${_("Currency Type")}', field: "currency_type"}, {name: '${_("Owner")}', get:getOrgInfo}, /* - {name: '${_("Balance (Total - (Spent + Encumberances))")}', get:getSummaryInfo}, + {name: '${_("Balance (Total - (Spent + Encumbrances))")}', get:getSummaryInfo}, {name: '${_("Amount Allocated to this Fund")}', get:getSummaryInfo}, {name: '${_("Spent Balance (Total - Spent)")}', get:getSummaryInfo}, {name: '${_("Total Debits (Spent + Encumbered)")}', get:getSummaryInfo}, @@ -136,7 +136,7 @@ {name: '${_("Origin Amount")}', field: "origin_amount"}, {name: '${_("Origin Currency Type")}', field: "origin_currency_type"}, {name: '${_("Amount")}', field: "amount"}, - {name: '${_("Encumberance")}', field: "encumberance"}, + {name: '${_("Encumbrance")}', field: "encumbrance"}, {name: '${_("Debit Type")}', field: "debit_type"}, {name: '${_("Transfer Destination")}', field: "xfer_destination"}, ]] -- 2.11.0