@@ -, +, @@
carried accidentally
---
installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql | 2 +-
installer/data/mysql/kohastructure.sql | 2 +-
installer/data/mysql/sysprefs.sql | 1 -
.../intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt | 2 +-
members/moremember.pl | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
--- a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
+++ a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
@@ -7,5 +7,5 @@ VALUES ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfe
-- ********* --
-- STRUCTURE --
-- ********* --
-ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0';
+ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0' AFTER `checkprevcheckout`;
UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -303,7 +303,7 @@ CREATE TABLE `categories` ( -- this table shows information related to Koha patr
`hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
`category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
`BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
- `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
+ `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category
`checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
`canbeguarantee` tinyint(1) NOT NULL default '0'
PRIMARY KEY (`categorycode`),
--- a/installer/data/mysql/sysprefs.sql
+++ a/installer/data/mysql/sysprefs.sql
@@ -7,7 +7,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
-('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option. Example: eng|fre|ita','Textarea'),
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
@@ -17,7 +17,7 @@
"dt_address":
"[% INCLUDE escape_address data=data %]",
"dt_action":
- "Select"
+ "Select"
}[% UNLESS loop.last %],[% END %]
[% END %]
]
--- a/members/moremember.pl
+++ a/members/moremember.pl
@@ -207,7 +207,6 @@ if ( $count ) {
$template->param( guarantees => @guarantees);
$template->param( amounttot => sprintf("%.2f",$totalmount));
}
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
if (my $guarantor = $patron->guarantor){
$template->param(isguarantor => 1);
--