adding "renewal" column and "stop_fines" type

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1158 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
index b245d81..d89dcc1 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
@@ -45,7 +45,7 @@ __PACKAGE__->columns(Essential => qw/xact_start usr target_copy circ_lib
                                     duration duration_rule renewal_remaining
                                     recuring_fine_rule recuring_fine stop_fines
                                     max_fine max_fine_rule fine_interval
-                                    stop_fines xact_finish due_date/);
+                                    stop_fines xact_finish due_date renewal/);
 
 #-------------------------------------------------------------------------------
 

diff --git a/Open-ILS/src/sql/Postgres/090.schema.action.sql b/Open-ILS/src/sql/Postgres/090.schema.action.sql
index 9362d90..888800a 100644 (file)
--- a/Open-ILS/src/sql/Postgres/090.schema.action.sql
+++ b/Open-ILS/src/sql/Postgres/090.schema.action.sql
@@ -56,6 +56,7 @@ CREATE TRIGGER action_survey_response_answer_date_fixup_tgr
 
 CREATE TABLE action.circulation (
        target_copy             BIGINT                          NOT NULL, -- asset.copy.id
+       renewal                 BOOL                            NOT NULL DEFAULT FALSE,
        circ_lib                INT                             NOT NULL, -- actor.org_unit.id
        duration_rule           TEXT                            NOT NULL, -- name of "circ duration" rule
        duration                INTERVAL                        NOT NULL, -- derived from "circ duration" rule
@@ -66,7 +67,7 @@ CREATE TABLE action.circulation (
        max_fine                NUMERIC(6,2)                    NOT NULL, -- derived from "max fine" rule
        fine_interval           INTERVAL                        NOT NULL DEFAULT '1 day'::INTERVAL, -- derived from "circ fine" rule
        due_date                TIMESTAMP WITH TIME ZONE        NOT NULL,
-       stop_fines              TEXT                            CHECK (stop_fines IN ('CHECKIN','CLAIMSRETURNED','LOST','MAXFINES'))
+       stop_fines              TEXT                            CHECK (stop_fines IN ('CHECKIN','CLAIMSRETURNED','LOST','MAXFINES','RENEW'))
 ) INHERITS (money.billable_xact);
 CREATE INDEX circ_open_xacts_idx ON action.circulation (usr) WHERE xact_finish IS NULL;