@@ -, +, @@ in moremember.pl --- Koha/Schema/Result/Accountline.pm | 11 ++++++-- Koha/Schema/Result/Aqbasket.pm | 6 ++-- Koha/Schema/Result/Aqorder.pm | 20 +++++++------- Koha/Schema/Result/Borrower.pm | 28 +++++++++++++++++-- Koha/Schema/Result/BorrowerModification.pm | 20 ++++++++++++-- Koha/Schema/Result/Branch.pm | 19 +++++++++++-- Koha/Schema/Result/Category.pm | 32 +++++++++++----------- Koha/Schema/Result/ClassSource.pm | 12 ++++++-- Koha/Schema/Result/Deletedborrower.pm | 20 ++++++++++++-- Koha/Schema/Result/ImportBatch.pm | 26 +++++++++--------- Koha/Schema/Result/Issue.pm | 20 ++++++++++++-- Koha/Schema/Result/Itemtype.pm | 24 +++++++++++++--- Koha/Schema/Result/Letter.pm | 6 ++-- Koha/Schema/Result/MessageQueue.pm | 11 ++++++-- Koha/Schema/Result/OldIssue.pm | 20 ++++++++++++-- Koha/Schema/Result/Overduerule.pm | 28 +++++++++++++++++-- Koha/Schema/Result/Patronimage.pm | 12 ++++++-- Koha/Schema/Result/Session.pm | 8 +++--- Koha/Schema/Result/Subscription.pm | 24 ++++++++-------- Koha/Schema/Result/Virtualshelve.pm | 19 +++++++++++-- Koha/Schema/Result/Z3950server.pm | 12 ++++++-- .../prog/en/modules/members/moremember.tt | 1 + members/moremember.pl | 1 + 23 files changed, 288 insertions(+), 92 deletions(-) --- a/Koha/Schema/Result/Accountline.pm +++ a/Koha/Schema/Result/Accountline.pm @@ -112,6 +112,11 @@ __PACKAGE__->table("accountlines"); data_type: 'text' is_nullable: 1 +=head2 paymentmode + + data_type: 'text' + is_nullable: 1 + =head2 manager_id data_type: 'integer' @@ -160,6 +165,8 @@ __PACKAGE__->add_columns( { data_type => "integer", default_value => 0, is_nullable => 0 }, "note", { data_type => "text", is_nullable => 1 }, + "paymentmode", + { data_type => "text", is_nullable => 1 }, "manager_id", { data_type => "integer", is_nullable => 1 }, ); @@ -214,8 +221,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jUiCeLLPg5228rNEBW0w2g +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FD7tYHHWmTfEUKDNEHNJ4w # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Aqbasket.pm +++ a/Koha/Schema/Result/Aqbasket.pm @@ -203,7 +203,7 @@ __PACKAGE__->belongs_to( { is_deferrable => 1, join_type => "LEFT", - on_delete => "RESTRICT", + on_delete => "CASCADE", on_update => "CASCADE", }, ); @@ -274,8 +274,8 @@ Composing rels: L -> borrowernumber __PACKAGE__->many_to_many("borrowernumbers", "aqbasketusers", "borrowernumber"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pT+YFf9nfD/dmBuE4RNCFw +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pHYJoalRN1RqFhm9WD2h+Q # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Aqorder.pm +++ a/Koha/Schema/Result/Aqorder.pm @@ -209,12 +209,6 @@ __PACKAGE__->table("aqorders"); datetime_undef_if_invalid: 1 is_nullable: 1 -=head2 subscriptionid - - data_type: 'integer' - is_foreign_key: 1 - is_nullable: 1 - =head2 parent_ordernumber data_type: 'integer' @@ -227,6 +221,12 @@ __PACKAGE__->table("aqorders"); is_nullable: 1 size: 16 +=head2 subscriptionid + + data_type: 'integer' + is_foreign_key: 1 + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -299,8 +299,6 @@ __PACKAGE__->add_columns( { data_type => "integer", default_value => 0, is_nullable => 1 }, "claimed_date", { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, - "subscriptionid", - { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "parent_ordernumber", { data_type => "integer", is_nullable => 1 }, "orderstatus", @@ -310,6 +308,8 @@ __PACKAGE__->add_columns( is_nullable => 1, size => 16, }, + "subscriptionid", + { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -492,8 +492,8 @@ Composing rels: L -> borrowernumber __PACKAGE__->many_to_many("borrowernumbers", "aqorder_users", "borrowernumber"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-05-14 11:27:15 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BCa/SxerJ+zEh8Pg9Jdkaw +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+86LQQVLbkBSA0AQYZz6aw # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Borrower.pm +++ a/Koha/Schema/Result/Borrower.pm @@ -285,6 +285,18 @@ __PACKAGE__->table("borrowers"); is_nullable: 1 size: 100 +=head2 ethnicity + + data_type: 'varchar' + is_nullable: 1 + size: 50 + +=head2 ethnotes + + data_type: 'varchar' + is_nullable: 1 + size: 255 + =head2 sex data_type: 'varchar' @@ -395,6 +407,12 @@ __PACKAGE__->table("borrowers"); default_value: 1 is_nullable: 0 +=head2 primary_contact_method + + data_type: 'varchar' + is_nullable: 1 + size: 45 + =cut __PACKAGE__->add_columns( @@ -522,6 +540,10 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "relationship", { data_type => "varchar", is_nullable => 1, size => 100 }, + "ethnicity", + { data_type => "varchar", is_nullable => 1, size => 50 }, + "ethnotes", + { data_type => "varchar", is_nullable => 1, size => 255 }, "sex", { data_type => "varchar", is_nullable => 1, size => 1 }, "password", @@ -560,6 +582,8 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 50 }, "privacy", { data_type => "integer", default_value => 1, is_nullable => 0 }, + "primary_contact_method", + { data_type => "varchar", is_nullable => 1, size => 45 }, ); =head1 PRIMARY KEY @@ -1153,8 +1177,8 @@ Composing rels: L -> ordernumber __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2015-10-21 19:50:05 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QafovaRBnm36nyoyQTGIgQ +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q85WYjBNddrsVi2U846zOA # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/BorrowerModification.pm +++ a/Koha/Schema/Result/BorrowerModification.pm @@ -295,6 +295,18 @@ __PACKAGE__->table("borrower_modifications"); is_nullable: 1 size: 100 +=head2 ethnicity + + data_type: 'varchar' + is_nullable: 1 + size: 50 + +=head2 ethnotes + + data_type: 'varchar' + is_nullable: 1 + size: 255 + =head2 sex data_type: 'varchar' @@ -528,6 +540,10 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "relationship", { data_type => "varchar", is_nullable => 1, size => 100 }, + "ethnicity", + { data_type => "varchar", is_nullable => 1, size => 50 }, + "ethnotes", + { data_type => "varchar", is_nullable => 1, size => 255 }, "sex", { data_type => "varchar", is_nullable => 1, size => 1 }, "password", @@ -583,8 +599,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("verification_token", "borrowernumber"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vZ9XjkjQv0q6l2kW3KMsLg +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eZoxdMxDenF69WRgtYNWEA # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Branch.pm +++ a/Koha/Schema/Result/Branch.pm @@ -457,6 +457,21 @@ __PACKAGE__->has_many( { cascade_copy => 0, cascade_delete => 0 }, ); +=head2 openinghours + +Type: has_many + +Related object: L + +=cut + +__PACKAGE__->has_many( + "openinghours", + "Koha::Schema::Result::Openinghour", + { "foreign.branchcode" => "self.branchcode" }, + { cascade_copy => 0, cascade_delete => 0 }, +); + =head2 reserves Type: has_many @@ -513,8 +528,8 @@ Composing rels: L -> categorycode __PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-06 15:26:36 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CGNPB/MkGLOihDThj43/4A +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:euU/hMyGHdFeCpLjs2UK1Q # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Category.pm +++ a/Koha/Schema/Result/Category.pm @@ -102,13 +102,6 @@ __PACKAGE__->table("categories"); is_nullable: 0 size: 1 -=head2 BlockExpiredPatronOpacActions - - accessor: 'block_expired_patron_opac_actions' - data_type: 'tinyint' - default_value: -1 - is_nullable: 0 - =head2 default_privacy data_type: 'enum' @@ -116,6 +109,13 @@ __PACKAGE__->table("categories"); extra: {list => ["default","never","forever"]} is_nullable: 0 +=head2 BlockExpiredPatronOpacActions + + accessor: 'block_expired_patron_opac_actions' + data_type: 'tinyint' + default_value: -1 + is_nullable: 0 + =cut __PACKAGE__->add_columns( @@ -147,13 +147,6 @@ __PACKAGE__->add_columns( { data_type => "tinyint", default_value => 0, is_nullable => 0 }, "category_type", { data_type => "varchar", default_value => "A", is_nullable => 0, size => 1 }, - "BlockExpiredPatronOpacActions", - { - accessor => "block_expired_patron_opac_actions", - data_type => "tinyint", - default_value => -1, - is_nullable => 0, - }, "default_privacy", { data_type => "enum", @@ -161,6 +154,13 @@ __PACKAGE__->add_columns( extra => { list => ["default", "never", "forever"] }, is_nullable => 0, }, + "BlockExpiredPatronOpacActions", + { + accessor => "block_expired_patron_opac_actions", + data_type => "tinyint", + default_value => -1, + is_nullable => 0, + }, ); =head1 PRIMARY KEY @@ -253,8 +253,8 @@ __PACKAGE__->might_have( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-08-18 13:01:05 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T4i7vp1kAZFXy6DiV1dqyw +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VvIIGRqjBIakxuHd+CTnRA # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/ClassSource.pm +++ a/Koha/Schema/Result/ClassSource.pm @@ -49,6 +49,12 @@ __PACKAGE__->table("class_sources"); is_nullable: 0 size: 10 +=head2 splitting_rule + + data_type: 'varchar' + is_nullable: 1 + size: 64 + =cut __PACKAGE__->add_columns( @@ -66,6 +72,8 @@ __PACKAGE__->add_columns( is_nullable => 0, size => 10, }, + "splitting_rule", + { data_type => "varchar", is_nullable => 1, size => 64 }, ); =head1 PRIMARY KEY @@ -98,8 +106,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2O58Q7wdbfAl6xmiW02PAA +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0W99ECImafmOglV+fZmCZQ # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Deletedborrower.pm +++ a/Koha/Schema/Result/Deletedborrower.pm @@ -283,6 +283,18 @@ __PACKAGE__->table("deletedborrowers"); is_nullable: 1 size: 100 +=head2 ethnicity + + data_type: 'varchar' + is_nullable: 1 + size: 50 + +=head2 ethnotes + + data_type: 'varchar' + is_nullable: 1 + size: 255 + =head2 sex data_type: 'varchar' @@ -508,6 +520,10 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "relationship", { data_type => "varchar", is_nullable => 1, size => 100 }, + "ethnicity", + { data_type => "varchar", is_nullable => 1, size => 50 }, + "ethnotes", + { data_type => "varchar", is_nullable => 1, size => 255 }, "sex", { data_type => "varchar", is_nullable => 1, size => 1 }, "password", @@ -549,8 +565,8 @@ __PACKAGE__->add_columns( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NofxbMGIuZqlGCqvjPEI1Q +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FEc3DunxET/+t5TmOwT4hA # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/ImportBatch.pm +++ a/Koha/Schema/Result/ImportBatch.pm @@ -99,13 +99,6 @@ __PACKAGE__->table("import_batches"); extra: {list => ["batch","z3950","webservice"]} is_nullable: 0 -=head2 record_type - - data_type: 'enum' - default_value: 'biblio' - extra: {list => ["biblio","auth","holdings"]} - is_nullable: 0 - =head2 file_name data_type: 'varchar' @@ -117,6 +110,13 @@ __PACKAGE__->table("import_batches"); data_type: 'mediumtext' is_nullable: 1 +=head2 record_type + + data_type: 'enum' + default_value: 'biblio' + extra: {list => ["biblio","auth","holdings"]} + is_nullable: 0 + =cut __PACKAGE__->add_columns( @@ -192,6 +192,10 @@ __PACKAGE__->add_columns( extra => { list => ["batch", "z3950", "webservice"] }, is_nullable => 0, }, + "file_name", + { data_type => "varchar", is_nullable => 1, size => 100 }, + "comments", + { data_type => "mediumtext", is_nullable => 1 }, "record_type", { data_type => "enum", @@ -199,10 +203,6 @@ __PACKAGE__->add_columns( extra => { list => ["biblio", "auth", "holdings"] }, is_nullable => 0, }, - "file_name", - { data_type => "varchar", is_nullable => 1, size => 100 }, - "comments", - { data_type => "mediumtext", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -235,8 +235,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-30 03:46:54 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4UfJtTeAzzsuBycjsn2foQ +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4vQdHH3hjEuWSkYyaI3Ozw # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Issue.pm +++ a/Koha/Schema/Result/Issue.pm @@ -101,6 +101,18 @@ __PACKAGE__->table("issues"); default_value: 0 is_nullable: 0 +=head2 downloadurl + + data_type: 'varchar' + is_nullable: 1 + size: 512 + +=head2 token + + data_type: 'varchar' + is_nullable: 1 + size: 64 + =cut __PACKAGE__->add_columns( @@ -151,6 +163,10 @@ __PACKAGE__->add_columns( }, "onsite_checkout", { data_type => "integer", default_value => 0, is_nullable => 0 }, + "downloadurl", + { data_type => "varchar", is_nullable => 1, size => 512 }, + "token", + { data_type => "varchar", is_nullable => 1, size => 64 }, ); =head1 PRIMARY KEY @@ -222,8 +238,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-11-04 12:00:58 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kREecsHr6wZPiokS946BHw +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hNMjQTvUsQItccNXjMMAgQ __PACKAGE__->belongs_to( "borrower", --- a/Koha/Schema/Result/Itemtype.pm +++ a/Koha/Schema/Result/Itemtype.pm @@ -35,6 +35,12 @@ __PACKAGE__->table("itemtypes"); data_type: 'mediumtext' is_nullable: 1 +=head2 categoriesearch + + data_type: 'varchar' + is_nullable: 0 + size: 15 + =head2 rentalcharge data_type: 'double precision' @@ -46,6 +52,12 @@ __PACKAGE__->table("itemtypes"); data_type: 'smallint' is_nullable: 1 +=head2 notdisplayopac + + data_type: 'varchar' + is_nullable: 1 + size: 15 + =head2 imageurl data_type: 'varchar' @@ -86,7 +98,7 @@ __PACKAGE__->table("itemtypes"); data_type: 'varchar' is_nullable: 1 - size: 80 + size: 15 =cut @@ -95,10 +107,14 @@ __PACKAGE__->add_columns( { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 }, "description", { data_type => "mediumtext", is_nullable => 1 }, + "categoriesearch", + { data_type => "varchar", is_nullable => 0, size => 15 }, "rentalcharge", { data_type => "double precision", is_nullable => 1, size => [16, 4] }, "notforloan", { data_type => "smallint", is_nullable => 1 }, + "notdisplayopac", + { data_type => "varchar", is_nullable => 1, size => 15 }, "imageurl", { data_type => "varchar", is_nullable => 1, size => 200 }, "summary", @@ -117,7 +133,7 @@ __PACKAGE__->add_columns( "hideinopac", { data_type => "tinyint", default_value => 0, is_nullable => 0 }, "searchcategory", - { data_type => "varchar", is_nullable => 1, size => 80 }, + { data_type => "varchar", is_nullable => 1, size => 15 }, ); =head1 PRIMARY KEY @@ -165,8 +181,8 @@ __PACKAGE__->might_have( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-22 11:11:19 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nknZ3AB923k+tEw7whtzQA +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jhuJFgWiIdqAKxNpr2kx9w # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Letter.pm +++ a/Koha/Schema/Result/Letter.pm @@ -136,7 +136,7 @@ __PACKAGE__->belongs_to( "message_transport_type", "Koha::Schema::Result::MessageTransportType", { message_transport_type => "message_transport_type" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, + { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" }, ); =head2 message_transports @@ -159,8 +159,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HFUQ+/BKlweHglzOlm0lUQ +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Kl9DqOlOuOALKMLJXeU0Hg # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/MessageQueue.pm +++ a/Koha/Schema/Result/MessageQueue.pm @@ -82,6 +82,11 @@ __PACKAGE__->table("message_queue"); data_type: 'mediumtext' is_nullable: 1 +=head2 sentto_address + + data_type: 'mediumtext' + is_nullable: 1 + =head2 from_address data_type: 'mediumtext' @@ -125,6 +130,8 @@ __PACKAGE__->add_columns( }, "to_address", { data_type => "mediumtext", is_nullable => 1 }, + "sentto_address", + { data_type => "mediumtext", is_nullable => 1 }, "from_address", { data_type => "mediumtext", is_nullable => 1 }, "content_type", @@ -181,8 +188,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-06-22 16:37:20 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nQcmtLCbGEeLFLFP4jwy2g +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fYeAw5j22GJHZ93zFFh90Q # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/OldIssue.pm +++ a/Koha/Schema/Result/OldIssue.pm @@ -100,6 +100,18 @@ __PACKAGE__->table("old_issues"); default_value: 0 is_nullable: 0 +=head2 downloadurl + + data_type: 'varchar' + is_nullable: 1 + size: 512 + +=head2 token + + data_type: 'varchar' + is_nullable: 1 + size: 64 + =cut __PACKAGE__->add_columns( @@ -150,6 +162,10 @@ __PACKAGE__->add_columns( }, "onsite_checkout", { data_type => "integer", default_value => 0, is_nullable => 0 }, + "downloadurl", + { data_type => "varchar", is_nullable => 1, size => 512 }, + "token", + { data_type => "varchar", is_nullable => 1, size => 64 }, ); =head1 PRIMARY KEY @@ -207,8 +223,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 13:04:51 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9GdzytyInRcFZns/q0qb3Q +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EUdlTU+977/ieg8IczWbLw # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Overduerule.pm +++ a/Koha/Schema/Result/Overduerule.pm @@ -55,6 +55,12 @@ __PACKAGE__->table("overduerules"); is_nullable: 1 size: 1 +=head2 invoice1 + + data_type: 'integer' + default_value: 0 + is_nullable: 1 + =head2 delay2 data_type: 'integer' @@ -67,6 +73,12 @@ __PACKAGE__->table("overduerules"); is_nullable: 1 size: 1 +=head2 invoice2 + + data_type: 'integer' + default_value: 0 + is_nullable: 1 + =head2 letter2 data_type: 'varchar' @@ -90,6 +102,12 @@ __PACKAGE__->table("overduerules"); default_value: 0 is_nullable: 1 +=head2 invoice3 + + data_type: 'integer' + default_value: 0 + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -103,10 +121,14 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 20 }, "debarred1", { data_type => "varchar", default_value => 0, is_nullable => 1, size => 1 }, + "invoice1", + { data_type => "integer", default_value => 0, is_nullable => 1 }, "delay2", { data_type => "integer", is_nullable => 1 }, "debarred2", { data_type => "varchar", default_value => 0, is_nullable => 1, size => 1 }, + "invoice2", + { data_type => "integer", default_value => 0, is_nullable => 1 }, "letter2", { data_type => "varchar", is_nullable => 1, size => 20 }, "delay3", @@ -115,6 +137,8 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 20 }, "debarred3", { data_type => "integer", default_value => 0, is_nullable => 1 }, + "invoice3", + { data_type => "integer", default_value => 0, is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -152,8 +176,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2014-05-02 18:04:32 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zQK4gTxkrPPwJzujbZxxdg +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wnpr7SjiybvE85EPXunZlQ # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Patronimage.pm +++ a/Koha/Schema/Result/Patronimage.pm @@ -26,6 +26,7 @@ __PACKAGE__->table("patronimage"); =head2 borrowernumber data_type: 'integer' + default_value: 0 is_foreign_key: 1 is_nullable: 0 @@ -44,7 +45,12 @@ __PACKAGE__->table("patronimage"); __PACKAGE__->add_columns( "borrowernumber", - { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, + { + data_type => "integer", + default_value => 0, + is_foreign_key => 1, + is_nullable => 0, + }, "mimetype", { data_type => "varchar", is_nullable => 0, size => 15 }, "imagefile", @@ -81,8 +87,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uuRGyWlemwOH1PCkvhqxdQ +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kyIvx7njXV5g9cDA4FspeQ # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Session.pm +++ a/Koha/Schema/Result/Session.pm @@ -32,7 +32,7 @@ __PACKAGE__->table("sessions"); =head2 a_session data_type: 'mediumtext' - is_nullable: 0 + is_nullable: 1 =cut @@ -40,7 +40,7 @@ __PACKAGE__->add_columns( "id", { data_type => "varchar", is_nullable => 0, size => 32 }, "a_session", - { data_type => "mediumtext", is_nullable => 0 }, + { data_type => "mediumtext", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -56,8 +56,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-04-23 13:21:59 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gsbP76fskUOelxUl8nAVMQ +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cZjdYdeQLMm8UxaKKfLTYQ # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Subscription.pm +++ a/Koha/Schema/Result/Subscription.pm @@ -113,15 +113,15 @@ __PACKAGE__->table("subscription"); data_type: 'integer' is_nullable: 1 -=head2 innerloop1 +=head2 lastvalue2 data_type: 'integer' - default_value: 0 is_nullable: 1 -=head2 lastvalue2 +=head2 innerloop1 data_type: 'integer' + default_value: 0 is_nullable: 1 =head2 innerloop2 @@ -130,15 +130,15 @@ __PACKAGE__->table("subscription"); default_value: 0 is_nullable: 1 -=head2 lastvalue3 +=head2 innerloop3 data_type: 'integer' + default_value: 0 is_nullable: 1 -=head2 innerloop3 +=head2 lastvalue3 data_type: 'integer' - default_value: 0 is_nullable: 1 =head2 firstacquidate @@ -292,16 +292,16 @@ __PACKAGE__->add_columns( { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 }, "lastvalue1", { data_type => "integer", is_nullable => 1 }, - "innerloop1", - { data_type => "integer", default_value => 0, is_nullable => 1 }, "lastvalue2", { data_type => "integer", is_nullable => 1 }, + "innerloop1", + { data_type => "integer", default_value => 0, is_nullable => 1 }, "innerloop2", { data_type => "integer", default_value => 0, is_nullable => 1 }, - "lastvalue3", - { data_type => "integer", is_nullable => 1 }, "innerloop3", { data_type => "integer", default_value => 0, is_nullable => 1 }, + "lastvalue3", + { data_type => "integer", is_nullable => 1 }, "firstacquidate", { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, "manualhistory", @@ -429,8 +429,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-07-11 09:26:55 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:57kc1/B3eNKQXAk9tlOy0A +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mp9/FRyx50TbPwrjiwfvMw # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Virtualshelve.pm +++ a/Koha/Schema/Result/Virtualshelve.pm @@ -47,6 +47,11 @@ __PACKAGE__->table("virtualshelves"); is_nullable: 1 size: 1 +=head2 useascarrousel + + data_type: 'tinyint' + is_nullable: 1 + =head2 sortfield data_type: 'varchar' @@ -86,6 +91,12 @@ __PACKAGE__->table("virtualshelves"); default_value: 0 is_nullable: 1 +=head2 addtocarrousel + + data_type: 'tinyint' + default_value: 0 + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -97,6 +108,8 @@ __PACKAGE__->add_columns( { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "category", { data_type => "varchar", is_nullable => 1, size => 1 }, + "useascarrousel", + { data_type => "tinyint", is_nullable => 1 }, "sortfield", { data_type => "varchar", @@ -124,6 +137,8 @@ __PACKAGE__->add_columns( { data_type => "tinyint", default_value => 1, is_nullable => 1 }, "allow_delete_other", { data_type => "tinyint", default_value => 0, is_nullable => 1 }, + "addtocarrousel", + { data_type => "tinyint", default_value => 0, is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -191,8 +206,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-11-05 10:39:28 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O3y89+0IUoePtcIHAqR+oA +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:npHiyjqUGJJwXU9Zo9X3SQ # You can replace this text with custom content, and it will be preserved on regeneration --- a/Koha/Schema/Result/Z3950server.pm +++ a/Koha/Schema/Result/Z3950server.pm @@ -120,6 +120,12 @@ __PACKAGE__->table("z3950servers"); data_type: 'mediumtext' is_nullable: 1 +=head2 attributes + + data_type: 'varchar' + is_nullable: 1 + size: 255 + =cut __PACKAGE__->add_columns( @@ -167,6 +173,8 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "add_xslt", { data_type => "mediumtext", is_nullable => 1 }, + "attributes", + { data_type => "varchar", is_nullable => 1, size => 255 }, ); =head1 PRIMARY KEY @@ -182,8 +190,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-09-01 10:16:04 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q0y03nGYIt0eDIVui0UUdw +# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-12-30 15:27:31 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XeNXCA+zQY0u3Z0ulYjOjQ # You can replace this text with custom code or comments, and it will be preserved on regeneration --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -239,6 +239,7 @@ function validate1(date) {
  • Guarantor:[% guarantorsurname %][%IF ( guarantorfirstname ) %], [% guarantorfirstname %] [% END %]
  • [% END %] [% END %] +
  • Main contact method: [% primary_contact_method %]
  • --- a/members/moremember.pl +++ a/members/moremember.pl @@ -339,6 +339,7 @@ $template->param( borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, + primary_contact_method => $data->{'primary_contact_method'}, was_renewed => $input->param('was_renewed') ? 1 : 0, branch => $branch, todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), --