[open-ils-commits] SPAM: r10058 - in
branches/acq-experiment/Open-ILS: examples src/extras
src/perlmods/OpenILS/Application/Acq src/sql/Pg
web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial
web/oilsweb/oilsweb/templates/oils/default/acq/financial
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Jul 16 17:43:35 EDT 2008
Author: dbs
Date: 2008-07-16 17:43:31 -0400 (Wed, 16 Jul 2008)
New Revision: 10058
Modified:
branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
branches/acq-experiment/Open-ILS/src/extras/ils_events.xml
branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm
branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm
branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
Log:
Typo: encumberance -> encumbrance
(Might as well get it early)
Modified: branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
===================================================================
--- branches/acq-experiment/Open-ILS/examples/fm_IDL.xml 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/examples/fm_IDL.xml 2008-07-16 21:43:31 UTC (rev 10058)
@@ -3363,7 +3363,7 @@
<field reporter:label="Origin Amount" name="origin_amount" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="money" />
<field reporter:label="Origin Currency" name="origin_currency_type" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="link" />
<field reporter:label="Amount" name="amount" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="money" />
- <field reporter:label="Encumberance" name="encumberance" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="text" />
+ <field reporter:label="Encumbrance" name="encumbrance" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="text" />
<field reporter:label="Debit Type" name="debit_type" oils_obj:array_position="9" oils_persist:virtual="false" reporter:datatype="text" />
</fields>
<links>
@@ -3421,13 +3421,13 @@
</links>
</class>
- <class id="acqfet" controller="open-ils.cstore open-ils.reporter-store" oils_obj:fieldmapper="acq::fund_encumberance_total" oils_persist:readonly="true" oils_persist:tablename="acq.fund_encumberance_total">
+ <class id="acqfet" controller="open-ils.cstore open-ils.reporter-store" oils_obj:fieldmapper="acq::fund_encumbrance_total" oils_persist:readonly="true" oils_persist:tablename="acq.fund_encumbrance_total">
<fields oils_persist:primary="fund">
<field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
<field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
<field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
<field reporter:label="Fund ID" name="fund" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="link" />
- <field reporter:label="Total Encumberance Amount" name="amount" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="money" />
+ <field reporter:label="Total Encumbrance Amount" name="amount" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="money" />
</fields>
<links>
<link field="fund" reltype="has_a" key="id" map="" class="acqf"/>
Modified: branches/acq-experiment/Open-ILS/src/extras/ils_events.xml
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/ils_events.xml 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/src/extras/ils_events.xml 2008-07-16 21:43:31 UTC (rev 10058)
@@ -577,8 +577,8 @@
<event code='1650' textcode='ACQ_FUND_ALLOCATION_TOTAL_NOT_FOUND'>
<desc xml:lang='en-US'>The requested acq.fund_allocation_total was not found</desc>
</event>
- <event code='1651' textcode='ACQ_FUND_ENCUMBERANCE_TOTAL_NOT_FOUND'>
- <desc xml:lang='en-US'>The requested acq.fund_encumberance_total was not found</desc>
+ <event code='1651' textcode='ACQ_FUND_ENCUMBRANCE_TOTAL_NOT_FOUND'>
+ <desc xml:lang='en-US'>The requested acq.fund_encumbrance_total was not found</desc>
</event>
<event code='1652' textcode='ACQ_FUND_SPENT_TOTAL_NOT_FOUND'>
<desc xml:lang='en-US'>The requested acq.fund_spent_total was not found</desc>
Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Financials.pm 2008-07-16 21:43:31 UTC (rev 10058)
@@ -312,7 +312,7 @@
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 @@
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 @@
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,
Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Acq/Lineitem.pm 2008-07-16 21:43:31 UTC (rev 10058)
@@ -644,7 +644,7 @@
$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});
Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/200.schema.acq.sql 2008-07-16 21:43:31 UTC (rev 10058)
@@ -70,7 +70,7 @@
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_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
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js 2008-07-16 21:43:31 UTC (rev 10058)
@@ -19,7 +19,7 @@
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);
}
}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-07-16 21:03:30 UTC (rev 10057)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-07-16 21:43:31 UTC (rev 10058)
@@ -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"},
]]
More information about the open-ils-commits
mailing list