From 4ce5c69a227fd899836ee176f331a3b2ad9e29d6 Mon Sep 17 00:00:00 2001 From: miker Date: Fri, 15 Jul 2005 19:15:26 +0000 Subject: [PATCH] I ... HATE ... JAVASCRIPT KEYWORDS!!!!!!!!!!!!!!! git-svn-id: svn://svn.open-ils.org/ILS/trunk@1215 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm | 2 +- Open-ILS/src/sql/Postgres/080.schema.money.sql | 8 ++++---- Open-ILS/src/support-scripts/generate-fines.pl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm index 2ceea75faf..52b69e8956 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/money.pm @@ -34,7 +34,7 @@ package money::billing; use base qw/money/; __PACKAGE__->table('money_billing'); __PACKAGE__->columns(Primary => 'id'); -__PACKAGE__->columns(Essential => qw/xact amount billing_ts note void/); +__PACKAGE__->columns(Essential => qw/xact amount billing_ts note voided/); #------------------------------------------------------------------------------- package money::payment; diff --git a/Open-ILS/src/sql/Postgres/080.schema.money.sql b/Open-ILS/src/sql/Postgres/080.schema.money.sql index 995d00d313..df10cf4ec3 100644 --- a/Open-ILS/src/sql/Postgres/080.schema.money.sql +++ b/Open-ILS/src/sql/Postgres/080.schema.money.sql @@ -18,7 +18,7 @@ CREATE TABLE money.billing ( amount NUMERIC(6,2) NOT NULL, billing_ts TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(), note TEXT, - void BOOL NOT NULL DEFALUT FALSE + voided BOOL NOT NULL DEFALUT FALSE ); CREATE INDEX m_b_xact_idx ON money.billing (xact); @@ -28,7 +28,7 @@ CREATE TABLE money.payment ( amount NUMERIC(6,2) NOT NULL, payment_ts TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(), note TEXT, - void BOOL NOT NULL DEFALUT FALSE + voided BOOL NOT NULL DEFALUT FALSE ); CREATE INDEX m_p_xact_idx ON money.payment (xact); @@ -43,8 +43,8 @@ CREATE OR REPLACE VIEW money.billable_xact_summary AS MAX(debit.billing_ts) AS last_billing_ts, SUM(COALESCE(debit.amount,0) - COALESCE(credit.amount,0)) AS balance_owed FROM money.billable_xact xact - LEFT JOIN money.billing debit ON (xact.id = debit.xact AND debit.void IS FALSE) - LEFT JOIN money.payment credit ON (xact.id = credit.xact AND credit.void IS FALSE) + LEFT JOIN money.billing debit ON (xact.id = debit.xact AND debit.voided IS FALSE) + LEFT JOIN money.payment credit ON (xact.id = credit.xact AND credit.voided IS FALSE) WHERE xact.xact_finish IS NULL GROUP BY 1,2,3,4; diff --git a/Open-ILS/src/support-scripts/generate-fines.pl b/Open-ILS/src/support-scripts/generate-fines.pl index 0c3941ed3f..1c8952912a 100755 --- a/Open-ILS/src/support-scripts/generate-fines.pl +++ b/Open-ILS/src/support-scripts/generate-fines.pl @@ -49,7 +49,7 @@ try { my $fine = $session->request( 'open-ils.storage.direct.money.billing.search', - { xact => $c->id, void => 'f' }, + { xact => $c->id, voided => 'f' }, { order_by => 'billing_ts DESC', limit => '1' } )->gather(1); -- 2.11.0