@@ -, +, @@ --- installer/data/mysql/atomicupdate/bug_14610.sql | 2 +- installer/data/mysql/kohastructure.sql | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_14610.sql +++ a/installer/data/mysql/atomicupdate/bug_14610.sql @@ -1,4 +1,4 @@ -ALTER TABLE `issuingrules` ADD `article_requests` ENUM( 'no', 'yes', 'bib_only', 'item_only' ) NOT NULL DEFAULT 'no'; +ALTER TABLE `issuingrules` ADD `article_requests` ENUM( 'no', 'yes', 'bib_only', 'item_only' ) NOT NULL DEFAULT 'no' AFTER `opacitemholds`; INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('ArticleRequests', '1', NULL, 'Enables the article request feature', 'YesNo'), --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -1194,6 +1194,7 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules cap_fine_to_replacement_price BOOLEAN NOT NULL DEFAULT '0', -- cap the fine based on item's replacement price onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf opacitemholds char(1) NOT NULL default 'N', -- allow opac users to place specific items on hold + article_requests enum('no','yes','bib_only','item_only') NOT NULL DEFAULT 'no', -- allow article requests to be placed, PRIMARY KEY (`branchcode`,`categorycode`,`itemtype`), KEY `categorycode` (`categorycode`), KEY `itemtype` (`itemtype`) @@ -3626,7 +3627,7 @@ CREATE TABLE `article_requests` ( `date` text, `pages` text, `chapters` text, - `status` enum('OPEN','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'OPEN', + `status` enum('PENDING','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'PENDING', `notes` text, `created_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `updated_on` timestamp NULL DEFAULT NULL, --