From ad49b54597c7d9aa82c0d56d7e5d4b23047b6a83 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 31 Oct 2013 07:41:57 -0400
Subject: [PATCH] Update Schema Files

http://bugs.koha-community.org/show_bug.cgi?id=6427
---
 Koha/Schema.pm                                     |    5 +-
 Koha/Schema/Result/Accountline.pm                  |   45 +---
 Koha/Schema/Result/Accountoffset.pm                |   24 +--
 Koha/Schema/Result/Alert.pm                        |   27 +--
 Koha/Schema/Result/Aqbasket.pm                     |   99 +++-----
 Koha/Schema/Result/Aqbasketgroup.pm                |   29 +--
 Koha/Schema/Result/Aqbookseller.pm                 |  105 +++-----
 Koha/Schema/Result/Aqbudget.pm                     |   43 +---
 Koha/Schema/Result/Aqbudgetborrower.pm             |   53 ++---
 Koha/Schema/Result/Aqbudgetperiod.pm               |   33 +--
 Koha/Schema/Result/AqbudgetsPlanning.pm            |   29 +--
 Koha/Schema/Result/Aqcontract.pm                   |   35 +--
 Koha/Schema/Result/Aqinvoice.pm                    |   75 ++----
 Koha/Schema/Result/Aqorder.pm                      |  180 +++++---------
 Koha/Schema/Result/Aqorderdelivery.pm              |   19 +-
 Koha/Schema/Result/AqordersItem.pm                 |   35 +--
 Koha/Schema/Result/AqordersTransfer.pm             |   62 +----
 Koha/Schema/Result/AuthHeader.pm                   |   33 +--
 Koha/Schema/Result/AuthSubfieldStructure.pm        |   38 +---
 Koha/Schema/Result/AuthTagStructure.pm             |   31 +--
 Koha/Schema/Result/AuthType.pm                     |   27 +--
 Koha/Schema/Result/AuthorisedValue.pm              |   27 +--
 Koha/Schema/Result/AuthorisedValuesBranch.pm       |   30 +--
 Koha/Schema/Result/Biblio.pm                       |   46 +---
 Koha/Schema/Result/BiblioFramework.pm              |   27 +--
 Koha/Schema/Result/Biblioimage.pm                  |   29 +--
 Koha/Schema/Result/Biblioitem.pm                   |   38 +---
 Koha/Schema/Result/Borrower.pm                     |  167 +++++---------
 Koha/Schema/Result/BorrowerAttribute.pm            |   20 +-
 Koha/Schema/Result/BorrowerAttributeType.pm        |   27 +--
 Koha/Schema/Result/BorrowerAttributeTypesBranch.pm |   50 ++---
 Koha/Schema/Result/BorrowerFile.pm                 |   35 +--
 Koha/Schema/Result/BorrowerMessagePreference.pm    |  100 +++------
 .../Result/BorrowerMessageTransportPreference.pm   |   33 +--
 Koha/Schema/Result/BorrowerModification.pm         |   47 +---
 Koha/Schema/Result/Branch.pm                       |   49 +---
 Koha/Schema/Result/BranchBorrowerCircRule.pm       |   53 ++---
 Koha/Schema/Result/BranchItemRule.pm               |   53 ++---
 Koha/Schema/Result/BranchTransferLimit.pm          |   27 +--
 Koha/Schema/Result/Branchcategory.pm               |   37 +---
 Koha/Schema/Result/Branchrelation.pm               |   33 +--
 Koha/Schema/Result/Branchtransfer.pm               |   56 ++---
 Koha/Schema/Result/Browser.pm                      |   16 +-
 Koha/Schema/Result/CategoriesBranch.pm             |   50 ++---
 Koha/Schema/Result/Category.pm                     |   30 +--
 Koha/Schema/Result/City.pm                         |   27 +--
 Koha/Schema/Result/ClassSortRule.pm                |   27 +--
 Koha/Schema/Result/ClassSource.pm                  |   29 +--
 Koha/Schema/Result/Collection.pm                   |   29 +--
 Koha/Schema/Result/CollectionTracking.pm           |   31 +--
 Koha/Schema/Result/Course.pm                       |   43 +---
 Koha/Schema/Result/CourseInstructor.pm             |   33 +--
 Koha/Schema/Result/CourseItem.pm                   |   75 ++-----
 Koha/Schema/Result/CourseReserve.pm                |   50 +----
 Koha/Schema/Result/CreatorBatch.pm                 |   49 +---
 Koha/Schema/Result/CreatorImage.pm                 |   40 +---
 Koha/Schema/Result/CreatorLayout.pm                |   27 +--
 Koha/Schema/Result/CreatorTemplate.pm              |   27 +--
 Koha/Schema/Result/Currency.pm                     |   45 +---
 Koha/Schema/Result/DefaultBorrowerCircRule.pm      |   29 +--
 Koha/Schema/Result/DefaultBranchCircRule.pm        |   29 +--
 Koha/Schema/Result/DefaultBranchItemRule.pm        |   29 +--
 Koha/Schema/Result/DefaultCircRule.pm              |   27 +--
 Koha/Schema/Result/Deletedbiblio.pm                |   36 +--
 Koha/Schema/Result/Deletedbiblioitem.pm            |   36 +--
 Koha/Schema/Result/Deletedborrower.pm              |   28 +--
 Koha/Schema/Result/Deleteditem.pm                  |   48 +---
 Koha/Schema/Result/Ethnicity.pm                    |   27 +--
 Koha/Schema/Result/ExportFormat.pm                 |   45 +---
 Koha/Schema/Result/Fieldmapping.pm                 |   27 +--
 Koha/Schema/Result/HoldFillTarget.pm               |   60 ++---
 Koha/Schema/Result/ImportAuth.pm                   |   18 +-
 Koha/Schema/Result/ImportBatch.pm                  |   36 +--
 Koha/Schema/Result/ImportBiblio.pm                 |   18 +-
 Koha/Schema/Result/ImportItem.pm                   |   29 +--
 Koha/Schema/Result/ImportRecord.pm                 |   66 ++----
 Koha/Schema/Result/ImportRecordMatches.pm          |   18 +-
 Koha/Schema/Result/Issue.pm                        |   73 ++----
 Koha/Schema/Result/Issuingrule.pm                  |   34 +--
 Koha/Schema/Result/Item.pm                         |  131 ++++-------
 .../Result/ItemCirculationAlertPreference.pm       |   27 +--
 Koha/Schema/Result/Itemtype.pm                     |   27 +--
 Koha/Schema/Result/LanguageDescription.pm          |   27 +--
 Koha/Schema/Result/LanguageRfc4646ToIso639.pm      |   27 +--
 Koha/Schema/Result/LanguageScriptBidi.pm           |   16 +-
 Koha/Schema/Result/LanguageScriptMapping.pm        |   16 +-
 Koha/Schema/Result/LanguageSubtagRegistry.pm       |   30 +--
 Koha/Schema/Result/Letter.pm                       |   31 +--
 Koha/Schema/Result/Linktracker.pm                  |   34 +--
 Koha/Schema/Result/MarcMatcher.pm                  |   27 +--
 Koha/Schema/Result/MarcSubfieldStructure.pm        |   31 +--
 Koha/Schema/Result/MarcTagStructure.pm             |   29 +--
 Koha/Schema/Result/Matchcheck.pm                   |   33 +--
 Koha/Schema/Result/MatcherMatchpoint.pm            |   20 +-
 Koha/Schema/Result/Matchpoint.pm                   |   57 ++---
 Koha/Schema/Result/MatchpointComponent.pm          |   55 ++---
 Koha/Schema/Result/MatchpointComponentNorm.pm      |   18 +-
 Koha/Schema/Result/Message.pm                      |   33 +--
 Koha/Schema/Result/MessageAttribute.pm             |   40 +---
 Koha/Schema/Result/MessageQueue.pm                 |   31 +--
 Koha/Schema/Result/MessageTransport.pm             |   73 ++----
 Koha/Schema/Result/MessageTransportType.pm         |   41 +---
 Koha/Schema/Result/NeedMergeAuthority.pm           |   27 +--
 Koha/Schema/Result/Notify.pm                       |   22 +-
 Koha/Schema/Result/OaiSet.pm                       |   50 +----
 Koha/Schema/Result/OaiSetsBiblio.pm                |   33 +--
 Koha/Schema/Result/OaiSetsDescription.pm           |   18 +-
 Koha/Schema/Result/OaiSetsMapping.pm               |   32 +--
 Koha/Schema/Result/OldIssue.pm                     |   73 ++----
 Koha/Schema/Result/OldReserve.pm                   |   99 +++------
 Koha/Schema/Result/OpacNews.pm                     |   36 +--
 Koha/Schema/Result/Overduerule.pm                  |   29 +--
 Koha/Schema/Result/Patroncard.pm                   |   35 +--
 Koha/Schema/Result/Patronimage.pm                  |   37 +--
 Koha/Schema/Result/PendingOfflineOperation.pm      |   33 +--
 Koha/Schema/Result/Permission.pm                   |   31 +--
 Koha/Schema/Result/PluginData.pm                   |   29 +--
 Koha/Schema/Result/Printer.pm                      |   27 +--
 Koha/Schema/Result/PrintersProfile.pm              |   46 +---
 Koha/Schema/Result/Quote.pm                        |   34 +--
 Koha/Schema/Result/Rating.pm                       |   59 ++---
 Koha/Schema/Result/RepeatableHoliday.pm            |   27 +--
 Koha/Schema/Result/ReportsDictionary.pm            |   41 +---
 Koha/Schema/Result/Reserve.pm                      |  106 +++------
 Koha/Schema/Result/Reserveconstraint.pm            |   25 +--
 Koha/Schema/Result/Review.pm                       |   68 ++----
 Koha/Schema/Result/Roadtype.pm                     |   27 +--
 Koha/Schema/Result/SavedReport.pm                  |   34 +--
 Koha/Schema/Result/SavedSql.pm                     |   48 +---
 Koha/Schema/Result/SearchHistory.pm                |   22 +-
 Koha/Schema/Result/Serial.pm                       |   36 +--
 Koha/Schema/Result/Serialitem.pm                   |   53 ++---
 Koha/Schema/Result/ServicesThrottle.pm             |   27 +--
 Koha/Schema/Result/Session.pm                      |   27 +--
 Koha/Schema/Result/SocialData.pm                   |   27 +--
 Koha/Schema/Result/SpecialHoliday.pm               |   27 +--
 Koha/Schema/Result/Statistic.pm                    |   23 +--
 Koha/Schema/Result/Stopword.pm                     |   16 +-
 Koha/Schema/Result/Subscription.pm                 |  250 ++++++++++++--------
 Koha/Schema/Result/Subscriptionhistory.pm          |   33 +--
 Koha/Schema/Result/Subscriptionroutinglist.pm      |   46 +---
 Koha/Schema/Result/Suggestion.pm                   |   50 +---
 Koha/Schema/Result/Systempreference.pm             |   27 +--
 Koha/Schema/Result/Tag.pm                          |   27 +--
 Koha/Schema/Result/TagAll.pm                       |   38 +---
 Koha/Schema/Result/TagsApproval.pm                 |   41 +---
 Koha/Schema/Result/TagsIndex.pm                    |   33 +--
 Koha/Schema/Result/TmpHoldsqueue.pm                |   19 +-
 Koha/Schema/Result/TransportCost.pm                |   33 +--
 Koha/Schema/Result/UserPermission.pm               |   25 +--
 Koha/Schema/Result/Userflag.pm                     |   27 +--
 Koha/Schema/Result/Virtualshelfcontent.pm          |   33 +--
 Koha/Schema/Result/Virtualshelfshare.pm            |   63 ++----
 Koha/Schema/Result/Virtualshelve.pm                |   68 ++----
 Koha/Schema/Result/Z3950server.pm                  |   31 +--
 Koha/Schema/Result/Zebraqueue.pm                   |   33 +--
 156 files changed, 1843 insertions(+), 4624 deletions(-)

diff --git a/Koha/Schema.pm b/Koha/Schema.pm
index cffc631..ee029ec 100644
--- a/Koha/Schema.pm
+++ b/Koha/Schema.pm
@@ -1,4 +1,3 @@
-use utf8;
 package Koha::Schema;
 
 # Created by DBIx::Class::Schema::Loader
@@ -12,8 +11,8 @@ use base 'DBIx::Class::Schema';
 __PACKAGE__->load_namespaces;
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oDUxXckmfk6H9YCjW8PZTw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UR5Z9l+TKrTAZ2DlP/3PeA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Accountline.pm b/Koha/Schema/Result/Accountline.pm
index 3b977fa..af0dff7 100644
--- a/Koha/Schema/Result/Accountline.pm
+++ b/Koha/Schema/Result/Accountline.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Accountline;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Accountline
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<accountlines>
+
+=head1 NAME
+
+Koha::Schema::Result::Accountline
 
 =cut
 
@@ -51,7 +47,6 @@ __PACKAGE__->table("accountlines");
 =head2 date
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 amount
@@ -91,7 +86,6 @@ __PACKAGE__->table("accountlines");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -134,7 +128,7 @@ __PACKAGE__->add_columns(
   "itemnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "amount",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "description",
@@ -149,10 +143,9 @@ __PACKAGE__->add_columns(
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "notify_id",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
@@ -163,17 +156,6 @@ __PACKAGE__->add_columns(
   "manager_id",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</accountlines_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("accountlines_id");
 
 =head1 RELATIONS
@@ -190,7 +172,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 itemnumber
@@ -205,17 +187,12 @@ __PACKAGE__->belongs_to(
   "itemnumber",
   "Koha::Schema::Result::Item",
   { itemnumber => "itemnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VLEuOBmnS+xgk7LXAqxtLw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:d8U0e0A5FNfsKd1HBVPpiA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Accountoffset.pm b/Koha/Schema/Result/Accountoffset.pm
index e9d8c2f..9ce043f 100644
--- a/Koha/Schema/Result/Accountoffset.pm
+++ b/Koha/Schema/Result/Accountoffset.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Accountoffset;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Accountoffset
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<accountoffsets>
+
+=head1 NAME
+
+Koha::Schema::Result::Accountoffset
 
 =cut
 
@@ -51,7 +47,6 @@ __PACKAGE__->table("accountoffsets");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -73,10 +68,9 @@ __PACKAGE__->add_columns(
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
 
@@ -94,12 +88,12 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OTfcUiJCPb5aU/gjqAb/bA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VfjbPMGKFa/V35uif0H+jw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Alert.pm b/Koha/Schema/Result/Alert.pm
index 2fae361..af061fe 100644
--- a/Koha/Schema/Result/Alert.pm
+++ b/Koha/Schema/Result/Alert.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Alert;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Alert
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<alert>
+
+=head1 NAME
+
+Koha::Schema::Result::Alert
 
 =cut
 
@@ -61,22 +57,11 @@ __PACKAGE__->add_columns(
   "externalid",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 20 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</alertid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("alertid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O4b7dlkDRkE6WLPKI5AO+A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bjUF27HFuGmH2o/0tWQaFQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbasket.pm b/Koha/Schema/Result/Aqbasket.pm
index 2ce507d..7e76923 100644
--- a/Koha/Schema/Result/Aqbasket.pm
+++ b/Koha/Schema/Result/Aqbasket.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbasket;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbasket
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbasket>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbasket
 
 =cut
 
@@ -54,13 +50,11 @@ __PACKAGE__->table("aqbasket");
 =head2 creationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 closedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 booksellerid
@@ -113,9 +107,9 @@ __PACKAGE__->add_columns(
   "contractnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "creationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "closedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "booksellerid",
   {
     data_type      => "integer",
@@ -134,94 +128,73 @@ __PACKAGE__->add_columns(
   "billingplace",
   { data_type => "varchar", is_nullable => 1, size => 10 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</basketno>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("basketno");
 
 =head1 RELATIONS
 
-=head2 aqorders
+=head2 booksellerid
 
-Type: has_many
+Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Aqorder>
+Related object: L<Koha::Schema::Result::Aqbookseller>
 
 =cut
 
-__PACKAGE__->has_many(
-  "aqorders",
-  "Koha::Schema::Result::Aqorder",
-  { "foreign.basketno" => "self.basketno" },
-  { cascade_copy => 0, cascade_delete => 0 },
+__PACKAGE__->belongs_to(
+  "booksellerid",
+  "Koha::Schema::Result::Aqbookseller",
+  { id => "booksellerid" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 basketgroupid
+=head2 contractnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Aqbasketgroup>
+Related object: L<Koha::Schema::Result::Aqcontract>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "basketgroupid",
-  "Koha::Schema::Result::Aqbasketgroup",
-  { id => "basketgroupid" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "contractnumber",
+  "Koha::Schema::Result::Aqcontract",
+  { contractnumber => "contractnumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 booksellerid
+=head2 basketgroupid
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Aqbookseller>
+Related object: L<Koha::Schema::Result::Aqbasketgroup>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "booksellerid",
-  "Koha::Schema::Result::Aqbookseller",
-  { id => "booksellerid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "basketgroupid",
+  "Koha::Schema::Result::Aqbasketgroup",
+  { id => "basketgroupid" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 contractnumber
+=head2 aqorders
 
-Type: belongs_to
+Type: has_many
 
-Related object: L<Koha::Schema::Result::Aqcontract>
+Related object: L<Koha::Schema::Result::Aqorder>
 
 =cut
 
-__PACKAGE__->belongs_to(
-  "contractnumber",
-  "Koha::Schema::Result::Aqcontract",
-  { contractnumber => "contractnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+__PACKAGE__->has_many(
+  "aqorders",
+  "Koha::Schema::Result::Aqorder",
+  { "foreign.basketno" => "self.basketno" },
+  { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:b4UNvDyA6jbgcTsaasbKYA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dTPNL+bVviZPwpkP8SU/dA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbasketgroup.pm b/Koha/Schema/Result/Aqbasketgroup.pm
index 6b3348e..1079117 100644
--- a/Koha/Schema/Result/Aqbasketgroup.pm
+++ b/Koha/Schema/Result/Aqbasketgroup.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbasketgroup;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbasketgroup
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbasketgroups>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbasketgroup
 
 =cut
 
@@ -89,17 +85,6 @@ __PACKAGE__->add_columns(
   "billingplace",
   { data_type => "varchar", is_nullable => 1, size => 10 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 =head1 RELATIONS
@@ -131,12 +116,12 @@ __PACKAGE__->belongs_to(
   "booksellerid",
   "Koha::Schema::Result::Aqbookseller",
   { id => "booksellerid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tT40YZgK7gOfNG3DVFTHiA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xsupYuylQF4u4WIOcZdUpg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbookseller.pm b/Koha/Schema/Result/Aqbookseller.pm
index ee2f4bd..35f5932 100644
--- a/Koha/Schema/Result/Aqbookseller.pm
+++ b/Koha/Schema/Result/Aqbookseller.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbookseller;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbookseller
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbooksellers>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbookseller
 
 =cut
 
@@ -276,20 +272,24 @@ __PACKAGE__->add_columns(
   "deliverytime",
   { data_type => "integer", is_nullable => 1 },
 );
+__PACKAGE__->set_primary_key("id");
 
-=head1 PRIMARY KEY
+=head1 RELATIONS
 
-=over 4
+=head2 aqbaskets
 
-=item * L</id>
+Type: has_many
 
-=back
+Related object: L<Koha::Schema::Result::Aqbasket>
 
 =cut
 
-__PACKAGE__->set_primary_key("id");
-
-=head1 RELATIONS
+__PACKAGE__->has_many(
+  "aqbaskets",
+  "Koha::Schema::Result::Aqbasket",
+  { "foreign.booksellerid" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 
 =head2 aqbasketgroups
 
@@ -306,19 +306,34 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 aqbaskets
+=head2 listprice
 
-Type: has_many
+Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Aqbasket>
+Related object: L<Koha::Schema::Result::Currency>
 
 =cut
 
-__PACKAGE__->has_many(
-  "aqbaskets",
-  "Koha::Schema::Result::Aqbasket",
-  { "foreign.booksellerid" => "self.id" },
-  { cascade_copy => 0, cascade_delete => 0 },
+__PACKAGE__->belongs_to(
+  "listprice",
+  "Koha::Schema::Result::Currency",
+  { currency => "listprice" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
+=head2 invoiceprice
+
+Type: belongs_to
+
+Related object: L<Koha::Schema::Result::Currency>
+
+=cut
+
+__PACKAGE__->belongs_to(
+  "invoiceprice",
+  "Koha::Schema::Result::Currency",
+  { currency => "invoiceprice" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 aqcontracts
@@ -351,49 +366,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 invoiceprice
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Currency>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "invoiceprice",
-  "Koha::Schema::Result::Currency",
-  { currency => "invoiceprice" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
-=head2 listprice
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Currency>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "listprice",
-  "Koha::Schema::Result::Currency",
-  { currency => "listprice" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Pqq5chHLUwm5Ss5CCQBL2g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bPdr4ywlswa+djhpSQdT+A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbudget.pm b/Koha/Schema/Result/Aqbudget.pm
index 336e2db..e7c76f4 100644
--- a/Koha/Schema/Result/Aqbudget.pm
+++ b/Koha/Schema/Result/Aqbudget.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbudget;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbudget
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbudgets>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbudget
 
 =cut
 
@@ -81,7 +77,6 @@ __PACKAGE__->table("aqbudgets");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -151,10 +146,9 @@ __PACKAGE__->add_columns(
   { data_type => "mediumtext", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "budget_period_id",
   { data_type => "integer", is_nullable => 1 },
@@ -167,17 +161,6 @@ __PACKAGE__->add_columns(
   "budget_permission",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</budget_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("budget_id");
 
 =head1 RELATIONS
@@ -227,19 +210,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 borrowernumbers
-
-Type: many_to_many
-
-Composing rels: L</aqbudgetborrowers> -> borrowernumber
-
-=cut
-
-__PACKAGE__->many_to_many("borrowernumbers", "aqbudgetborrowers", "borrowernumber");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dxOTKpdIJ6ruJUE++4fC8w
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+IqWvsBTWC/ft7EUrB9RwQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbudgetborrower.pm b/Koha/Schema/Result/Aqbudgetborrower.pm
index d6b416f..3f78bae 100644
--- a/Koha/Schema/Result/Aqbudgetborrower.pm
+++ b/Koha/Schema/Result/Aqbudgetborrower.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbudgetborrower;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbudgetborrower
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbudgetborrowers>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbudgetborrower
 
 =cut
 
@@ -43,56 +39,43 @@ __PACKAGE__->add_columns(
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</budget_id>
-
-=item * L</borrowernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("budget_id", "borrowernumber");
 
 =head1 RELATIONS
 
-=head2 borrowernumber
+=head2 budget
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Aqbudget>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "budget",
+  "Koha::Schema::Result::Aqbudget",
+  { budget_id => "budget_id" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 budget
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Aqbudget>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "budget",
-  "Koha::Schema::Result::Aqbudget",
-  { budget_id => "budget_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3PWUS/0L1ERMWWkghUO7ng
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CIMzl8MPmGHRkD/qGMgo1A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqbudgetperiod.pm b/Koha/Schema/Result/Aqbudgetperiod.pm
index 6015893..add693c 100644
--- a/Koha/Schema/Result/Aqbudgetperiod.pm
+++ b/Koha/Schema/Result/Aqbudgetperiod.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqbudgetperiod;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqbudgetperiod
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbudgetperiods>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqbudgetperiod
 
 =cut
 
@@ -32,13 +28,11 @@ __PACKAGE__->table("aqbudgetperiods");
 =head2 budget_period_startdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =head2 budget_period_enddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =head2 budget_period_active
@@ -81,9 +75,9 @@ __PACKAGE__->add_columns(
   "budget_period_id",
   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
   "budget_period_startdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 },
+  { data_type => "date", is_nullable => 0 },
   "budget_period_enddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 },
+  { data_type => "date", is_nullable => 0 },
   "budget_period_active",
   { data_type => "tinyint", default_value => 0, is_nullable => 1 },
   "budget_period_description",
@@ -97,22 +91,11 @@ __PACKAGE__->add_columns(
   "sort2_authcat",
   { data_type => "varchar", is_nullable => 1, size => 10 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</budget_period_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("budget_period_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SaTTCao0N80iDL8pgf5k1A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PjXWlLG2g3GjrbtMiu+vWg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AqbudgetsPlanning.pm b/Koha/Schema/Result/AqbudgetsPlanning.pm
index 990e04e..90677eb 100644
--- a/Koha/Schema/Result/AqbudgetsPlanning.pm
+++ b/Koha/Schema/Result/AqbudgetsPlanning.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AqbudgetsPlanning;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AqbudgetsPlanning
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqbudgets_planning>
+
+=head1 NAME
+
+Koha::Schema::Result::AqbudgetsPlanning
 
 =cut
 
@@ -82,17 +78,6 @@ __PACKAGE__->add_columns(
   "display",
   { data_type => "tinyint", default_value => 1, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</plan_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("plan_id");
 
 =head1 RELATIONS
@@ -109,12 +94,12 @@ __PACKAGE__->belongs_to(
   "budget",
   "Koha::Schema::Result::Aqbudget",
   { budget_id => "budget_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7nhWIqgezc+W8sHqJkXCbQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dsgDxVLfQyCVrSVst/i7gQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqcontract.pm b/Koha/Schema/Result/Aqcontract.pm
index 59fe41a..3250101 100644
--- a/Koha/Schema/Result/Aqcontract.pm
+++ b/Koha/Schema/Result/Aqcontract.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqcontract;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqcontract
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqcontract>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqcontract
 
 =cut
 
@@ -32,13 +28,11 @@ __PACKAGE__->table("aqcontract");
 =head2 contractstartdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 contractenddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 contractname
@@ -64,9 +58,9 @@ __PACKAGE__->add_columns(
   "contractnumber",
   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
   "contractstartdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "contractenddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "contractname",
   { data_type => "varchar", is_nullable => 1, size => 50 },
   "contractdescription",
@@ -74,17 +68,6 @@ __PACKAGE__->add_columns(
   "booksellerid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</contractnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("contractnumber");
 
 =head1 RELATIONS
@@ -116,12 +99,12 @@ __PACKAGE__->belongs_to(
   "booksellerid",
   "Koha::Schema::Result::Aqbookseller",
   { id => "booksellerid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PF3RUnj5urQYDFzxsVxOcw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UKJ77lJhJx/XTbsYTxziSA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqinvoice.pm b/Koha/Schema/Result/Aqinvoice.pm
index c063d30..7fb936f 100644
--- a/Koha/Schema/Result/Aqinvoice.pm
+++ b/Koha/Schema/Result/Aqinvoice.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqinvoice;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqinvoice
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqinvoices>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqinvoice
 
 =cut
 
@@ -43,19 +39,16 @@ __PACKAGE__->table("aqinvoices");
 =head2 shipmentdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 billingdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 closedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 shipmentcost
@@ -80,46 +73,20 @@ __PACKAGE__->add_columns(
   "booksellerid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
   "shipmentdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "billingdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "closedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "shipmentcost",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "shipmentcost_budgetid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</invoiceid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("invoiceid");
 
 =head1 RELATIONS
 
-=head2 aqorders
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::Aqorder>
-
-=cut
-
-__PACKAGE__->has_many(
-  "aqorders",
-  "Koha::Schema::Result::Aqorder",
-  { "foreign.invoiceid" => "self.invoiceid" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 =head2 booksellerid
 
 Type: belongs_to
@@ -132,7 +99,7 @@ __PACKAGE__->belongs_to(
   "booksellerid",
   "Koha::Schema::Result::Aqbookseller",
   { id => "booksellerid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 shipmentcost_budgetid
@@ -147,17 +114,27 @@ __PACKAGE__->belongs_to(
   "shipmentcost_budgetid",
   "Koha::Schema::Result::Aqbudget",
   { budget_id => "shipmentcost_budgetid" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
+=head2 aqorders
+
+Type: has_many
+
+Related object: L<Koha::Schema::Result::Aqorder>
+
+=cut
+
+__PACKAGE__->has_many(
+  "aqorders",
+  "Koha::Schema::Result::Aqorder",
+  { "foreign.invoiceid" => "self.invoiceid" },
+  { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nV0lYm2w4xX8cwVmTVF3YQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:34iAasZQ+xtOZz/As0QXPA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqorder.pm b/Koha/Schema/Result/Aqorder.pm
index 30c34a7..78af480 100644
--- a/Koha/Schema/Result/Aqorder.pm
+++ b/Koha/Schema/Result/Aqorder.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqorder;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqorder
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqorders>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqorder
 
 =cut
 
@@ -38,7 +34,6 @@ __PACKAGE__->table("aqorders");
 =head2 entrydate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 quantity
@@ -67,7 +62,6 @@ __PACKAGE__->table("aqorders");
 =head2 datereceived
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 invoiceid
@@ -103,7 +97,6 @@ __PACKAGE__->table("aqorders");
 =head2 datecancellationprinted
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 notes
@@ -130,7 +123,6 @@ __PACKAGE__->table("aqorders");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -171,7 +163,6 @@ __PACKAGE__->table("aqorders");
 =head2 budgetdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 sort1
@@ -212,7 +203,6 @@ __PACKAGE__->table("aqorders");
 =head2 claimed_date
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 subscriptionid
@@ -226,13 +216,6 @@ __PACKAGE__->table("aqorders");
   data_type: 'integer'
   is_nullable: 1
 
-=head2 orderstatus
-
-  data_type: 'varchar'
-  default_value: 'new'
-  is_nullable: 1
-  size: 16
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -241,7 +224,7 @@ __PACKAGE__->add_columns(
   "biblionumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "entrydate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "quantity",
   { data_type => "smallint", is_nullable => 1 },
   "currency",
@@ -251,7 +234,7 @@ __PACKAGE__->add_columns(
   "totalamount",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "datereceived",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "invoiceid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "freight",
@@ -263,7 +246,7 @@ __PACKAGE__->add_columns(
   "cancelledby",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "datecancellationprinted",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "notes",
   { data_type => "mediumtext", is_nullable => 1 },
   "supplierreference",
@@ -274,10 +257,9 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "rrp",
   { data_type => "decimal", is_nullable => 1, size => [13, 2] },
@@ -292,7 +274,7 @@ __PACKAGE__->add_columns(
   "budgetgroup_id",
   { data_type => "integer", is_nullable => 0 },
   "budgetdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "sort1",
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "sort2",
@@ -306,79 +288,16 @@ __PACKAGE__->add_columns(
   "claims_count",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
   "claimed_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "subscriptionid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "parent_ordernumber",
   { data_type => "integer", is_nullable => 1 },
-  "orderstatus",
-  {
-    data_type => "varchar",
-    default_value => "new",
-    is_nullable => 1,
-    size => 16,
-  },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</ordernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("ordernumber");
 
 =head1 RELATIONS
 
-=head2 aqorders_items
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::AqordersItem>
-
-=cut
-
-__PACKAGE__->has_many(
-  "aqorders_items",
-  "Koha::Schema::Result::AqordersItem",
-  { "foreign.ordernumber" => "self.ordernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
-=head2 aqorders_transfers_ordernumber_from
-
-Type: might_have
-
-Related object: L<Koha::Schema::Result::AqordersTransfer>
-
-=cut
-
-__PACKAGE__->might_have(
-  "aqorders_transfers_ordernumber_from",
-  "Koha::Schema::Result::AqordersTransfer",
-  { "foreign.ordernumber_from" => "self.ordernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
-=head2 aqorders_transfers_ordernumber_to
-
-Type: might_have
-
-Related object: L<Koha::Schema::Result::AqordersTransfer>
-
-=cut
-
-__PACKAGE__->might_have(
-  "aqorders_transfers_ordernumber_to",
-  "Koha::Schema::Result::AqordersTransfer",
-  { "foreign.ordernumber_to" => "self.ordernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 =head2 basketno
 
 Type: belongs_to
@@ -391,12 +310,7 @@ __PACKAGE__->belongs_to(
   "basketno",
   "Koha::Schema::Result::Aqbasket",
   { basketno => "basketno" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 biblionumber
@@ -411,12 +325,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 invoiceid
@@ -431,12 +340,7 @@ __PACKAGE__->belongs_to(
   "invoiceid",
   "Koha::Schema::Result::Aqinvoice",
   { invoiceid => "invoiceid" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 subscriptionid
@@ -451,17 +355,57 @@ __PACKAGE__->belongs_to(
   "subscriptionid",
   "Koha::Schema::Result::Subscription",
   { subscriptionid => "subscriptionid" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
+=head2 aqorders_items
+
+Type: has_many
+
+Related object: L<Koha::Schema::Result::AqordersItem>
+
+=cut
+
+__PACKAGE__->has_many(
+  "aqorders_items",
+  "Koha::Schema::Result::AqordersItem",
+  { "foreign.ordernumber" => "self.ordernumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
+=head2 aqorders_transfers_ordernumber_from
+
+Type: might_have
+
+Related object: L<Koha::Schema::Result::AqordersTransfer>
+
+=cut
+
+__PACKAGE__->might_have(
+  "aqorders_transfers_ordernumber_from",
+  "Koha::Schema::Result::AqordersTransfer",
+  { "foreign.ordernumber_from" => "self.ordernumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
+=head2 aqorders_transfers_ordernumber_to
+
+Type: might_have
+
+Related object: L<Koha::Schema::Result::AqordersTransfer>
+
+=cut
+
+__PACKAGE__->might_have(
+  "aqorders_transfers_ordernumber_to",
+  "Koha::Schema::Result::AqordersTransfer",
+  { "foreign.ordernumber_to" => "self.ordernumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-22 13:37:51
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+bznx/vy8sLxOYDBZkwycw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rsqrX9MgWYSQ2pb+TGZxzg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Aqorderdelivery.pm b/Koha/Schema/Result/Aqorderdelivery.pm
index 453d8ff..29461ab 100644
--- a/Koha/Schema/Result/Aqorderdelivery.pm
+++ b/Koha/Schema/Result/Aqorderdelivery.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Aqorderdelivery;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Aqorderdelivery
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqorderdelivery>
+
+=head1 NAME
+
+Koha::Schema::Result::Aqorderdelivery
 
 =cut
 
@@ -26,7 +22,6 @@ __PACKAGE__->table("aqorderdelivery");
 =head2 ordernumber
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 deliverynumber
@@ -55,7 +50,7 @@ __PACKAGE__->table("aqorderdelivery");
 
 __PACKAGE__->add_columns(
   "ordernumber",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "deliverynumber",
   { data_type => "smallint", default_value => 0, is_nullable => 0 },
   "deliverydate",
@@ -67,8 +62,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hS/Ww/p7nHWiHNumkBifiQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:r39DPkLPMWM4R/bjeM7TRA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AqordersItem.pm b/Koha/Schema/Result/AqordersItem.pm
index ac99f2e..0b106fd 100644
--- a/Koha/Schema/Result/AqordersItem.pm
+++ b/Koha/Schema/Result/AqordersItem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AqordersItem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AqordersItem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqorders_items>
+
+=head1 NAME
+
+Koha::Schema::Result::AqordersItem
 
 =cut
 
@@ -37,7 +33,6 @@ __PACKAGE__->table("aqorders_items");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -50,23 +45,11 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 0 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemnumber");
 
 =head1 RELATIONS
@@ -83,12 +66,12 @@ __PACKAGE__->belongs_to(
   "ordernumber",
   "Koha::Schema::Result::Aqorder",
   { ordernumber => "ordernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hvDuLTY3idYc1ujykNDrPQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wr1Bafbx8K9pOyS5ODNKOQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AqordersTransfer.pm b/Koha/Schema/Result/AqordersTransfer.pm
index 0a4ec88..e89aa70 100644
--- a/Koha/Schema/Result/AqordersTransfer.pm
+++ b/Koha/Schema/Result/AqordersTransfer.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AqordersTransfer;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AqordersTransfer
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<aqorders_transfers>
+
+=head1 NAME
+
+Koha::Schema::Result::AqordersTransfer
 
 =cut
 
@@ -38,7 +34,6 @@ __PACKAGE__->table("aqorders_transfers");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -51,38 +46,13 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<ordernumber_from>
-
-=over 4
-
-=item * L</ordernumber_from>
-
-=back
-
-=cut
-
-__PACKAGE__->add_unique_constraint("ordernumber_from", ["ordernumber_from"]);
-
-=head2 C<ordernumber_to>
-
-=over 4
-
-=item * L</ordernumber_to>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("ordernumber_to", ["ordernumber_to"]);
+__PACKAGE__->add_unique_constraint("ordernumber_from", ["ordernumber_from"]);
 
 =head1 RELATIONS
 
@@ -98,12 +68,7 @@ __PACKAGE__->belongs_to(
   "ordernumber_from",
   "Koha::Schema::Result::Aqorder",
   { ordernumber => "ordernumber_from" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 ordernumber_to
@@ -118,17 +83,12 @@ __PACKAGE__->belongs_to(
   "ordernumber_to",
   "Koha::Schema::Result::Aqorder",
   { ordernumber => "ordernumber_to" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1WX3cQyoYmNmPed+OqdUNA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:b8m5L9iatmwdHnKsY+c7cw
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthHeader.pm b/Koha/Schema/Result/AuthHeader.pm
index 095c5d4..7731098 100644
--- a/Koha/Schema/Result/AuthHeader.pm
+++ b/Koha/Schema/Result/AuthHeader.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthHeader;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthHeader
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<auth_header>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthHeader
 
 =cut
 
@@ -40,13 +36,11 @@ __PACKAGE__->table("auth_header");
 =head2 datecreated
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 datemodified
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 origincode
@@ -88,9 +82,9 @@ __PACKAGE__->add_columns(
   "authtypecode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
   "datecreated",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "datemodified",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "origincode",
   { data_type => "varchar", is_nullable => 1, size => 20 },
   "authtrees",
@@ -102,22 +96,11 @@ __PACKAGE__->add_columns(
   "marcxml",
   { data_type => "longtext", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</authid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("authid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Z7KMl3JNWUJlOte5CD25Dw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9XgDIYvKEpxsZWoDRrO9yg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthSubfieldStructure.pm b/Koha/Schema/Result/AuthSubfieldStructure.pm
index 8c16d3e..52a352f 100644
--- a/Koha/Schema/Result/AuthSubfieldStructure.pm
+++ b/Koha/Schema/Result/AuthSubfieldStructure.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthSubfieldStructure;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthSubfieldStructure
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<auth_subfield_structure>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthSubfieldStructure
 
 =cut
 
@@ -124,11 +120,6 @@ __PACKAGE__->table("auth_subfield_structure");
   is_nullable: 0
   size: 10
 
-=head2 defaultvalue
-
-  data_type: 'text'
-  is_nullable: 1
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -164,29 +155,12 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", default_value => "", is_nullable => 1, size => 45 },
   "frameworkcode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
-  "defaultvalue",
-  { data_type => "text", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</authtypecode>
-
-=item * L</tagfield>
-
-=item * L</tagsubfield>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("authtypecode", "tagfield", "tagsubfield");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:24BKrmX1lug68+rmXE1riA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QeC+S50mKgdMrzf9nt+f7A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthTagStructure.pm b/Koha/Schema/Result/AuthTagStructure.pm
index 4612b32..da18c3a 100644
--- a/Koha/Schema/Result/AuthTagStructure.pm
+++ b/Koha/Schema/Result/AuthTagStructure.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthTagStructure;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthTagStructure
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<auth_tag_structure>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthTagStructure
 
 =cut
 
@@ -94,19 +90,6 @@ __PACKAGE__->add_columns(
   "authorised_value",
   { data_type => "varchar", is_nullable => 1, size => 10 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</authtypecode>
-
-=item * L</tagfield>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("authtypecode", "tagfield");
 
 =head1 RELATIONS
@@ -123,12 +106,12 @@ __PACKAGE__->belongs_to(
   "authtypecode",
   "Koha::Schema::Result::AuthType",
   { authtypecode => "authtypecode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4ulaQnDuxrwYgCKJ/Qygaw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:D+TZCdiYyiUO4kUMm1I8zg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthType.pm b/Koha/Schema/Result/AuthType.pm
index d4a7d77..6c93efd 100644
--- a/Koha/Schema/Result/AuthType.pm
+++ b/Koha/Schema/Result/AuthType.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthType;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthType
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<auth_types>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthType
 
 =cut
 
@@ -61,17 +57,6 @@ __PACKAGE__->add_columns(
   "summary",
   { data_type => "mediumtext", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</authtypecode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("authtypecode");
 
 =head1 RELATIONS
@@ -92,8 +77,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sy0+bAJuYz5t9OVCq0Vo8Q
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ixqbgOOtvs839AUhRShPBg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthorisedValue.pm b/Koha/Schema/Result/AuthorisedValue.pm
index 0366aec..ea840e3 100644
--- a/Koha/Schema/Result/AuthorisedValue.pm
+++ b/Koha/Schema/Result/AuthorisedValue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthorisedValue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthorisedValue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<authorised_values>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthorisedValue
 
 =cut
 
@@ -77,17 +73,6 @@ __PACKAGE__->add_columns(
   "imageurl",
   { data_type => "varchar", is_nullable => 1, size => 200 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 =head1 RELATIONS
@@ -108,8 +93,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:N6Q7Y4sHL03X170zJ3APUA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:a/pjEC6ofo+j/agJgNvXSw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/AuthorisedValuesBranch.pm b/Koha/Schema/Result/AuthorisedValuesBranch.pm
index 0c6e2d9..568c63a 100644
--- a/Koha/Schema/Result/AuthorisedValuesBranch.pm
+++ b/Koha/Schema/Result/AuthorisedValuesBranch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::AuthorisedValuesBranch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::AuthorisedValuesBranch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<authorised_values_branches>
+
+=head1 NAME
+
+Koha::Schema::Result::AuthorisedValuesBranch
 
 =cut
 
@@ -59,12 +55,7 @@ __PACKAGE__->belongs_to(
   "av",
   "Koha::Schema::Result::AuthorisedValue",
   { id => "av_id" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 branchcode
@@ -79,17 +70,12 @@ __PACKAGE__->belongs_to(
   "branchcode",
   "Koha::Schema::Result::Branch",
   { branchcode => "branchcode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:k6hCbzMVZ1VRsubvdrZMYQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QWRGeUtZbnzio0EzoHPDCw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Biblio.pm b/Koha/Schema/Result/Biblio.pm
index 2a8c28e..c5080fc 100644
--- a/Koha/Schema/Result/Biblio.pm
+++ b/Koha/Schema/Result/Biblio.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Biblio;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Biblio
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<biblio>
+
+=head1 NAME
+
+Koha::Schema::Result::Biblio
 
 =cut
 
@@ -74,14 +70,12 @@ __PACKAGE__->table("biblio");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 datecreated
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =head2 abstract
@@ -112,27 +106,15 @@ __PACKAGE__->add_columns(
   { data_type => "smallint", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "datecreated",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 },
+  { data_type => "date", is_nullable => 0 },
   "abstract",
   { data_type => "mediumtext", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</biblionumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("biblionumber");
 
 =head1 RELATIONS
@@ -317,19 +299,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 sets
-
-Type: many_to_many
-
-Composing rels: L</oai_sets_biblios> -> set
-
-=cut
-
-__PACKAGE__->many_to_many("sets", "oai_sets_biblios", "set");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0//8OGf7OteNnwT03g4QsA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SbXv9zUchfLnIcA6ik3jKg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BiblioFramework.pm b/Koha/Schema/Result/BiblioFramework.pm
index 36c223b..545cada 100644
--- a/Koha/Schema/Result/BiblioFramework.pm
+++ b/Koha/Schema/Result/BiblioFramework.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BiblioFramework;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BiblioFramework
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<biblio_framework>
+
+=head1 NAME
+
+Koha::Schema::Result::BiblioFramework
 
 =cut
 
@@ -45,22 +41,11 @@ __PACKAGE__->add_columns(
   "frameworktext",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 255 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</frameworkcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("frameworkcode");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KY1w7J/5cBsz9VV7QEBKPw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nbCA/P3NKanJHbgld6g/kw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Biblioimage.pm b/Koha/Schema/Result/Biblioimage.pm
index 400eef5..7328ec1 100644
--- a/Koha/Schema/Result/Biblioimage.pm
+++ b/Koha/Schema/Result/Biblioimage.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Biblioimage;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Biblioimage
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<biblioimages>
+
+=head1 NAME
+
+Koha::Schema::Result::Biblioimage
 
 =cut
 
@@ -65,17 +61,6 @@ __PACKAGE__->add_columns(
   "thumbnail",
   { data_type => "mediumblob", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</imagenumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("imagenumber");
 
 =head1 RELATIONS
@@ -92,12 +77,12 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WdDuaUrR0IC6+8jJwlev6A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6QEacXDZtNLOkvlhWvYmhg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Biblioitem.pm b/Koha/Schema/Result/Biblioitem.pm
index 085251e..477d568 100644
--- a/Koha/Schema/Result/Biblioitem.pm
+++ b/Koha/Schema/Result/Biblioitem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Biblioitem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Biblioitem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<biblioitems>
+
+=head1 NAME
+
+Koha::Schema::Result::Biblioitem
 
 =cut
 
@@ -84,7 +80,6 @@ __PACKAGE__->table("biblioitems");
 =head2 volumedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 volumedesc
@@ -120,7 +115,6 @@ __PACKAGE__->table("biblioitems");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -245,7 +239,7 @@ __PACKAGE__->add_columns(
   "publishercode",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "volumedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "volumedesc",
   { data_type => "text", is_nullable => 1 },
   "collectiontitle",
@@ -260,10 +254,9 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "illus",
   { data_type => "varchar", is_nullable => 1, size => 255 },
@@ -298,17 +291,6 @@ __PACKAGE__->add_columns(
   "marcxml",
   { data_type => "longtext", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</biblioitemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("biblioitemnumber");
 
 =head1 RELATIONS
@@ -325,7 +307,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 items
@@ -344,8 +326,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Vyrs9pWYoqhWJw+cRy1EVg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fThPEh3uTO8Cd3nnCGEuzw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Borrower.pm b/Koha/Schema/Result/Borrower.pm
index 67642d1..3dbc54c 100644
--- a/Koha/Schema/Result/Borrower.pm
+++ b/Koha/Schema/Result/Borrower.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Borrower;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Borrower
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrowers>
+
+=head1 NAME
+
+Koha::Schema::Result::Borrower
 
 =cut
 
@@ -191,7 +187,6 @@ __PACKAGE__->table("borrowers");
 =head2 dateofbirth
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branchcode
@@ -213,13 +208,11 @@ __PACKAGE__->table("borrowers");
 =head2 dateenrolled
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 dateexpiry
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 gonenoaddress
@@ -235,7 +228,6 @@ __PACKAGE__->table("borrowers");
 =head2 debarred
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 debarredcomment
@@ -397,6 +389,13 @@ __PACKAGE__->table("borrowers");
   default_value: 1
   is_nullable: 0
 
+=head2 account_balance
+
+  data_type: 'decimal'
+  default_value: 0.000000
+  is_nullable: 0
+  size: [28,6]
+
 =cut
 
 __PACKAGE__->add_columns(
@@ -463,7 +462,7 @@ __PACKAGE__->add_columns(
   "b_phone",
   { data_type => "mediumtext", is_nullable => 1 },
   "dateofbirth",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "branchcode",
   {
     data_type => "varchar",
@@ -481,15 +480,15 @@ __PACKAGE__->add_columns(
     size => 10,
   },
   "dateenrolled",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "dateexpiry",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "gonenoaddress",
   { data_type => "tinyint", is_nullable => 1 },
   "lost",
   { data_type => "tinyint", is_nullable => 1 },
   "debarred",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "debarredcomment",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "contactname",
@@ -546,35 +545,48 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 50 },
   "privacy",
   { data_type => "integer", default_value => 1, is_nullable => 0 },
+  "account_balance",
+  {
+    data_type => "decimal",
+    default_value => "0.000000",
+    is_nullable => 0,
+    size => [28, 6],
+  },
 );
+__PACKAGE__->set_primary_key("borrowernumber");
+__PACKAGE__->add_unique_constraint("cardnumber", ["cardnumber"]);
 
-=head1 PRIMARY KEY
+=head1 RELATIONS
 
-=over 4
+=head2 account_credits
 
-=item * L</borrowernumber>
+Type: has_many
 
-=back
+Related object: L<Koha::Schema::Result::AccountCredit>
 
 =cut
 
-__PACKAGE__->set_primary_key("borrowernumber");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<cardnumber>
+__PACKAGE__->has_many(
+  "account_credits",
+  "Koha::Schema::Result::AccountCredit",
+  { "foreign.borrowernumber" => "self.borrowernumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 
-=over 4
+=head2 account_debits
 
-=item * L</cardnumber>
+Type: has_many
 
-=back
+Related object: L<Koha::Schema::Result::AccountDebit>
 
 =cut
 
-__PACKAGE__->add_unique_constraint("cardnumber", ["cardnumber"]);
-
-=head1 RELATIONS
+__PACKAGE__->has_many(
+  "account_debits",
+  "Koha::Schema::Result::AccountDebit",
+  { "foreign.borrowernumber" => "self.borrowernumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 
 =head2 accountlines
 
@@ -636,21 +648,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 borrower_debarments
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::BorrowerDebarment>
-
-=cut
-
-__PACKAGE__->has_many(
-  "borrower_debarments",
-  "Koha::Schema::Result::BorrowerDebarment",
-  { "foreign.borrowernumber" => "self.borrowernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 =head2 borrower_files
 
 Type: has_many
@@ -681,34 +678,34 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 branchcode
+=head2 categorycode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Category>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "branchcode",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "branchcode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "categorycode",
+  "Koha::Schema::Result::Category",
+  { categorycode => "categorycode" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 categorycode
+=head2 branchcode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Category>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "categorycode",
-  "Koha::Schema::Result::Category",
-  { categorycode => "categorycode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "branchcode",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "branchcode" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 course_instructors
@@ -816,36 +813,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 patron_list_patrons
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::PatronListPatron>
-
-=cut
-
-__PACKAGE__->has_many(
-  "patron_list_patrons",
-  "Koha::Schema::Result::PatronListPatron",
-  { "foreign.borrowernumber" => "self.borrowernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
-=head2 patron_lists
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::PatronList>
-
-=cut
-
-__PACKAGE__->has_many(
-  "patron_lists",
-  "Koha::Schema::Result::PatronList",
-  { "foreign.owner" => "self.borrowernumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 =head2 patroncards
 
 Type: has_many
@@ -1026,29 +993,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 budgets
-
-Type: many_to_many
-
-Composing rels: L</aqbudgetborrowers> -> budget
-
-=cut
-
-__PACKAGE__->many_to_many("budgets", "aqbudgetborrowers", "budget");
-
-=head2 courses
-
-Type: many_to_many
-
-Composing rels: L</course_instructors> -> course
-
-=cut
-
-__PACKAGE__->many_to_many("courses", "course_instructors", "course");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-31 01:30:23
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eZfDBeShjI29Q8P6Z8CQNA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mLnDHTMVBhWw4yS02TDcOQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerAttribute.pm b/Koha/Schema/Result/BorrowerAttribute.pm
index 0b7a96c..a8ec68e 100644
--- a/Koha/Schema/Result/BorrowerAttribute.pm
+++ b/Koha/Schema/Result/BorrowerAttribute.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerAttribute;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerAttribute
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_attributes>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerAttribute
 
 =cut
 
@@ -75,7 +71,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 code
@@ -90,12 +86,12 @@ __PACKAGE__->belongs_to(
   "code",
   "Koha::Schema::Result::BorrowerAttributeType",
   { code => "code" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9oRy+X25+b7vB03WSnpFTg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Bcpja8FL3mBbkCmsW+YCAQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerAttributeType.pm b/Koha/Schema/Result/BorrowerAttributeType.pm
index f2f5120..5188939 100644
--- a/Koha/Schema/Result/BorrowerAttributeType.pm
+++ b/Koha/Schema/Result/BorrowerAttributeType.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerAttributeType;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerAttributeType
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_attribute_types>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerAttributeType
 
 =cut
 
@@ -116,17 +112,6 @@ __PACKAGE__->add_columns(
   "class",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 255 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</code>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("code");
 
 =head1 RELATIONS
@@ -162,8 +147,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xFtIJw7nKVVk6dzBVDO60A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IEeQhigJCzM/B3I1In0vSw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm b/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm
index 362b5cc..ce25625 100644
--- a/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm
+++ b/Koha/Schema/Result/BorrowerAttributeTypesBranch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerAttributeTypesBranch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerAttributeTypesBranch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_attribute_types_branches>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerAttributeTypesBranch
 
 =cut
 
@@ -48,49 +44,39 @@ __PACKAGE__->add_columns(
 
 =head1 RELATIONS
 
-=head2 b_branchcode
+=head2 bat_code
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::BorrowerAttributeType>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "b_branchcode",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "b_branchcode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "bat_code",
+  "Koha::Schema::Result::BorrowerAttributeType",
+  { code => "bat_code" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 bat_code
+=head2 b_branchcode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::BorrowerAttributeType>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "bat_code",
-  "Koha::Schema::Result::BorrowerAttributeType",
-  { code => "bat_code" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "b_branchcode",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "b_branchcode" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/ppDBtfKZvUNcERWFbLuuw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+fUjRJTVpwxTczYnA5Q9rA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerFile.pm b/Koha/Schema/Result/BorrowerFile.pm
index 6f0982d..c8045de 100644
--- a/Koha/Schema/Result/BorrowerFile.pm
+++ b/Koha/Schema/Result/BorrowerFile.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerFile;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerFile
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_files>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerFile
 
 =cut
 
@@ -61,7 +57,6 @@ __PACKAGE__->table("borrower_files");
 =head2 date_uploaded
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -82,23 +77,11 @@ __PACKAGE__->add_columns(
   { data_type => "longblob", is_nullable => 0 },
   "date_uploaded",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</file_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("file_id");
 
 =head1 RELATIONS
@@ -115,12 +98,12 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sbkf7bvdO4CgmiBLgIwYQg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mvf7TdO9v5EgQFAMjTO7Ug
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerMessagePreference.pm b/Koha/Schema/Result/BorrowerMessagePreference.pm
index 3069df5..57ef92f 100644
--- a/Koha/Schema/Result/BorrowerMessagePreference.pm
+++ b/Koha/Schema/Result/BorrowerMessagePreference.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerMessagePreference;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerMessagePreference
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_message_preferences>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerMessagePreference
 
 =cut
 
@@ -82,38 +78,10 @@ __PACKAGE__->add_columns(
   "wants_digest",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</borrower_message_preference_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("borrower_message_preference_id");
 
 =head1 RELATIONS
 
-=head2 borrower_message_transport_preferences
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::BorrowerMessageTransportPreference>
-
-=cut
-
-__PACKAGE__->has_many(
-  "borrower_message_transport_preferences",
-  "Koha::Schema::Result::BorrowerMessageTransportPreference",
-  {
-    "foreign.borrower_message_preference_id" => "self.borrower_message_preference_id",
-  },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
-
 =head2 borrowernumber
 
 Type: belongs_to
@@ -126,71 +94,59 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 categorycode
+=head2 message_attribute
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Category>
+Related object: L<Koha::Schema::Result::MessageAttribute>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "categorycode",
-  "Koha::Schema::Result::Category",
-  { categorycode => "categorycode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "message_attribute",
+  "Koha::Schema::Result::MessageAttribute",
+  { message_attribute_id => "message_attribute_id" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 message_attribute
+=head2 categorycode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::MessageAttribute>
+Related object: L<Koha::Schema::Result::Category>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "message_attribute",
-  "Koha::Schema::Result::MessageAttribute",
-  { message_attribute_id => "message_attribute_id" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "categorycode",
+  "Koha::Schema::Result::Category",
+  { categorycode => "categorycode" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 message_transport_types
+=head2 borrower_message_transport_preferences
 
-Type: many_to_many
+Type: has_many
 
-Composing rels: L</borrower_message_transport_preferences> -> message_transport_type
+Related object: L<Koha::Schema::Result::BorrowerMessageTransportPreference>
 
 =cut
 
-__PACKAGE__->many_to_many(
-  "message_transport_types",
+__PACKAGE__->has_many(
   "borrower_message_transport_preferences",
-  "message_transport_type",
+  "Koha::Schema::Result::BorrowerMessageTransportPreference",
+  {
+    "foreign.borrower_message_preference_id" => "self.borrower_message_preference_id",
+  },
+  { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hd5sPnxGi5332WmzqCus8A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dWzckwhkF4EeG3zZmZYBxA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerMessageTransportPreference.pm b/Koha/Schema/Result/BorrowerMessageTransportPreference.pm
index 10f3f46..a55a824 100644
--- a/Koha/Schema/Result/BorrowerMessageTransportPreference.pm
+++ b/Koha/Schema/Result/BorrowerMessageTransportPreference.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerMessageTransportPreference;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerMessageTransportPreference
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_message_transport_preferences>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerMessageTransportPreference
 
 =cut
 
@@ -57,19 +53,6 @@ __PACKAGE__->add_columns(
     size => 20,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</borrower_message_preference_id>
-
-=item * L</message_transport_type>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("borrower_message_preference_id", "message_transport_type");
 
 =head1 RELATIONS
@@ -88,7 +71,7 @@ __PACKAGE__->belongs_to(
   {
     borrower_message_preference_id => "borrower_message_preference_id",
   },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 message_transport_type
@@ -103,12 +86,12 @@ __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" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yHKWBur//GdtTL5IdjcgIg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6YU8O7rRjooqpzvXTf6hkA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BorrowerModification.pm b/Koha/Schema/Result/BorrowerModification.pm
index 08cf62b..bb0af8b 100644
--- a/Koha/Schema/Result/BorrowerModification.pm
+++ b/Koha/Schema/Result/BorrowerModification.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BorrowerModification;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BorrowerModification
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<borrower_modifications>
+
+=head1 NAME
+
+Koha::Schema::Result::BorrowerModification
 
 =cut
 
@@ -26,7 +22,6 @@ __PACKAGE__->table("borrower_modifications");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -205,7 +200,6 @@ __PACKAGE__->table("borrower_modifications");
 =head2 dateofbirth
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branchcode
@@ -223,13 +217,11 @@ __PACKAGE__->table("borrower_modifications");
 =head2 dateenrolled
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 dateexpiry
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 gonenoaddress
@@ -245,7 +237,6 @@ __PACKAGE__->table("borrower_modifications");
 =head2 debarred
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 debarredcomment
@@ -411,10 +402,9 @@ __PACKAGE__->table("borrower_modifications");
 __PACKAGE__->add_columns(
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "verification_token",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 255 },
@@ -481,21 +471,21 @@ __PACKAGE__->add_columns(
   "b_phone",
   { data_type => "mediumtext", is_nullable => 1 },
   "dateofbirth",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "branchcode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "categorycode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "dateenrolled",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "dateexpiry",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "gonenoaddress",
   { data_type => "tinyint", is_nullable => 1 },
   "lost",
   { data_type => "tinyint", is_nullable => 1 },
   "debarred",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "debarredcomment",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "contactname",
@@ -553,24 +543,11 @@ __PACKAGE__->add_columns(
   "privacy",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</verification_token>
-
-=item * L</borrowernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("verification_token", "borrowernumber");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:11X5o3u4/EqPRVbQdtAuOA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EJHN/T7TWmOqiyW2IOfAZA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm
index a2cfba3..0374dec 100644
--- a/Koha/Schema/Result/Branch.pm
+++ b/Koha/Schema/Result/Branch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Branch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Branch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branches>
+
+=head1 NAME
+
+Koha::Schema::Result::Branch
 
 =cut
 
@@ -158,17 +154,6 @@ __PACKAGE__->add_columns(
   "opac_info",
   { data_type => "text", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</branchcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("branchcode");
 
 =head1 RELATIONS
@@ -368,7 +353,7 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 items_holdingbranches
+=head2 items_homebranches
 
 Type: has_many
 
@@ -377,13 +362,13 @@ Related object: L<Koha::Schema::Result::Item>
 =cut
 
 __PACKAGE__->has_many(
-  "items_holdingbranches",
+  "items_homebranches",
   "Koha::Schema::Result::Item",
-  { "foreign.holdingbranch" => "self.branchcode" },
+  { "foreign.homebranch" => "self.branchcode" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 items_homebranches
+=head2 items_holdingbranches
 
 Type: has_many
 
@@ -392,9 +377,9 @@ Related object: L<Koha::Schema::Result::Item>
 =cut
 
 __PACKAGE__->has_many(
-  "items_homebranches",
+  "items_holdingbranches",
   "Koha::Schema::Result::Item",
-  { "foreign.homebranch" => "self.branchcode" },
+  { "foreign.holdingbranch" => "self.branchcode" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
@@ -443,19 +428,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 categorycodes
-
-Type: many_to_many
-
-Composing rels: L</branchrelations> -> categorycode
-
-=cut
-
-__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7TY0QNDQkB33iQeLAgo1qg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1Ucp7F1fg8mFW+eZjOfDtw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BranchBorrowerCircRule.pm b/Koha/Schema/Result/BranchBorrowerCircRule.pm
index fce2914..e619178 100644
--- a/Koha/Schema/Result/BranchBorrowerCircRule.pm
+++ b/Koha/Schema/Result/BranchBorrowerCircRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BranchBorrowerCircRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BranchBorrowerCircRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branch_borrower_circ_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::BranchBorrowerCircRule
 
 =cut
 
@@ -52,56 +48,43 @@ __PACKAGE__->add_columns(
   "maxissueqty",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</categorycode>
-
-=item * L</branchcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("categorycode", "branchcode");
 
 =head1 RELATIONS
 
-=head2 branchcode
+=head2 categorycode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Category>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "branchcode",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "branchcode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "categorycode",
+  "Koha::Schema::Result::Category",
+  { categorycode => "categorycode" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 categorycode
+=head2 branchcode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Category>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "categorycode",
-  "Koha::Schema::Result::Category",
-  { categorycode => "categorycode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "branchcode",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "branchcode" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:X24Sil3WTnxoeAa/16tpUQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Td+m6WeQtSkKvKjYLjxWHg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BranchItemRule.pm b/Koha/Schema/Result/BranchItemRule.pm
index a074597..c866d6e 100644
--- a/Koha/Schema/Result/BranchItemRule.pm
+++ b/Koha/Schema/Result/BranchItemRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BranchItemRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BranchItemRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branch_item_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::BranchItemRule
 
 =cut
 
@@ -60,56 +56,43 @@ __PACKAGE__->add_columns(
   "returnbranch",
   { data_type => "varchar", is_nullable => 1, size => 15 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemtype>
-
-=item * L</branchcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemtype", "branchcode");
 
 =head1 RELATIONS
 
-=head2 branchcode
+=head2 itemtype
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Itemtype>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "branchcode",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "branchcode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "itemtype",
+  "Koha::Schema::Result::Itemtype",
+  { itemtype => "itemtype" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 itemtype
+=head2 branchcode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Itemtype>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "itemtype",
-  "Koha::Schema::Result::Itemtype",
-  { itemtype => "itemtype" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "branchcode",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "branchcode" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YLO0fLLilsc7tSfx8v/biw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:htnqayHITGdrDIS4hzqKBA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/BranchTransferLimit.pm b/Koha/Schema/Result/BranchTransferLimit.pm
index 2c3011f..d5ee5a8 100644
--- a/Koha/Schema/Result/BranchTransferLimit.pm
+++ b/Koha/Schema/Result/BranchTransferLimit.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::BranchTransferLimit;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::BranchTransferLimit
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branch_transfer_limits>
+
+=head1 NAME
+
+Koha::Schema::Result::BranchTransferLimit
 
 =cut
 
@@ -67,22 +63,11 @@ __PACKAGE__->add_columns(
   "ccode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</limitid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("limitid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HN/uEtGTNOewMCqTQZ1Vew
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VmkjtQKEx+M5zL1pxL+tzg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Branchcategory.pm b/Koha/Schema/Result/Branchcategory.pm
index 6417ca9..8f8a04e 100644
--- a/Koha/Schema/Result/Branchcategory.pm
+++ b/Koha/Schema/Result/Branchcategory.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Branchcategory;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Branchcategory
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branchcategories>
+
+=head1 NAME
+
+Koha::Schema::Result::Branchcategory
 
 =cut
 
@@ -67,17 +63,6 @@ __PACKAGE__->add_columns(
   "show_in_pulldown",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</categorycode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("categorycode");
 
 =head1 RELATIONS
@@ -97,19 +82,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 branchcodes
-
-Type: many_to_many
-
-Composing rels: L</branchrelations> -> branchcode
-
-=cut
-
-__PACKAGE__->many_to_many("branchcodes", "branchrelations", "branchcode");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HU5N7lAiLIz6yC9va3fDbg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:t6PCNvQgTiu/wqdMIgURBg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Branchrelation.pm b/Koha/Schema/Result/Branchrelation.pm
index e44412b..e66d2a3 100644
--- a/Koha/Schema/Result/Branchrelation.pm
+++ b/Koha/Schema/Result/Branchrelation.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Branchrelation;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Branchrelation
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branchrelations>
+
+=head1 NAME
+
+Koha::Schema::Result::Branchrelation
 
 =cut
 
@@ -59,19 +55,6 @@ __PACKAGE__->add_columns(
     size => 10,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</branchcode>
-
-=item * L</categorycode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("branchcode", "categorycode");
 
 =head1 RELATIONS
@@ -88,7 +71,7 @@ __PACKAGE__->belongs_to(
   "branchcode",
   "Koha::Schema::Result::Branch",
   { branchcode => "branchcode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 categorycode
@@ -103,12 +86,12 @@ __PACKAGE__->belongs_to(
   "categorycode",
   "Koha::Schema::Result::Branchcategory",
   { categorycode => "categorycode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lBOq8k+wurbp633kbi8tVg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yExh0GVmI9iXkDeGO8zK8g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Branchtransfer.pm b/Koha/Schema/Result/Branchtransfer.pm
index 1976ffd..17e1bd3 100644
--- a/Koha/Schema/Result/Branchtransfer.pm
+++ b/Koha/Schema/Result/Branchtransfer.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Branchtransfer;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Branchtransfer
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<branchtransfers>
+
+=head1 NAME
+
+Koha::Schema::Result::Branchtransfer
 
 =cut
 
@@ -33,7 +29,6 @@ __PACKAGE__->table("branchtransfers");
 =head2 datesent
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 frombranch
@@ -47,7 +42,6 @@ __PACKAGE__->table("branchtransfers");
 =head2 datearrived
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 tobranch
@@ -74,11 +68,7 @@ __PACKAGE__->add_columns(
     is_nullable    => 0,
   },
   "datesent",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "frombranch",
   {
     data_type => "varchar",
@@ -88,11 +78,7 @@ __PACKAGE__->add_columns(
     size => 10,
   },
   "datearrived",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "tobranch",
   {
     data_type => "varchar",
@@ -119,42 +105,42 @@ __PACKAGE__->belongs_to(
   "frombranch",
   "Koha::Schema::Result::Branch",
   { branchcode => "frombranch" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 itemnumber
+=head2 tobranch
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Item>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "itemnumber",
-  "Koha::Schema::Result::Item",
-  { itemnumber => "itemnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "tobranch",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "tobranch" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 tobranch
+=head2 itemnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Item>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "tobranch",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "tobranch" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "itemnumber",
+  "Koha::Schema::Result::Item",
+  { itemnumber => "itemnumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NPbH+5o2BVPj8yeoUqEavw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XQitmLgI/r7W3Hxb04QzFg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Browser.pm b/Koha/Schema/Result/Browser.pm
index 3e9c1d3..e303f37 100644
--- a/Koha/Schema/Result/Browser.pm
+++ b/Koha/Schema/Result/Browser.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Browser;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Browser
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<browser>
+
+=head1 NAME
+
+Koha::Schema::Result::Browser
 
 =cut
 
@@ -66,8 +62,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eMoAXr+/JrrwEjJ3dRRwoA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:F9KZKkx8J7J9T3wNPoY40g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CategoriesBranch.pm b/Koha/Schema/Result/CategoriesBranch.pm
index 584c177..de183dd 100644
--- a/Koha/Schema/Result/CategoriesBranch.pm
+++ b/Koha/Schema/Result/CategoriesBranch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CategoriesBranch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CategoriesBranch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<categories_branches>
+
+=head1 NAME
+
+Koha::Schema::Result::CategoriesBranch
 
 =cut
 
@@ -48,49 +44,39 @@ __PACKAGE__->add_columns(
 
 =head1 RELATIONS
 
-=head2 branchcode
+=head2 categorycode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Category>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "branchcode",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "branchcode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "categorycode",
+  "Koha::Schema::Result::Category",
+  { categorycode => "categorycode" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 categorycode
+=head2 branchcode
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Category>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "categorycode",
-  "Koha::Schema::Result::Category",
-  { categorycode => "categorycode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "branchcode",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "branchcode" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9fXKFDUQsOx+uqF+slRhSw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vJ43XeGNm5uM3IheKs1IbA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Category.pm b/Koha/Schema/Result/Category.pm
index 12ac12f..84d55b4 100644
--- a/Koha/Schema/Result/Category.pm
+++ b/Koha/Schema/Result/Category.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Category;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Category
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<categories>
+
+=head1 NAME
+
+Koha::Schema::Result::Category
 
 =cut
 
@@ -43,7 +39,6 @@ __PACKAGE__->table("categories");
 =head2 enrolmentperioddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 upperagelimit
@@ -112,7 +107,7 @@ __PACKAGE__->add_columns(
   "enrolmentperiod",
   { data_type => "smallint", is_nullable => 1 },
   "enrolmentperioddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "upperagelimit",
   { data_type => "smallint", is_nullable => 1 },
   "dateofbirthrequired",
@@ -134,17 +129,6 @@ __PACKAGE__->add_columns(
   "category_type",
   { data_type => "varchar", default_value => "A", is_nullable => 0, size => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</categorycode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("categorycode");
 
 =head1 RELATIONS
@@ -225,8 +209,8 @@ __PACKAGE__->might_have(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lert5/PnaztNZ9rmoGc2Gg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QNXqVu/EwamorUjwzGyeEQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/City.pm b/Koha/Schema/Result/City.pm
index 9f9ce6b..831f4c4 100644
--- a/Koha/Schema/Result/City.pm
+++ b/Koha/Schema/Result/City.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::City;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::City
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<cities>
+
+=head1 NAME
+
+Koha::Schema::Result::City
 
 =cut
 
@@ -68,22 +64,11 @@ __PACKAGE__->add_columns(
   "city_zipcode",
   { data_type => "varchar", is_nullable => 1, size => 20 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</cityid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("cityid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zEjfS65sp13yF7dH8/ojZQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tyMf7X1jNBInGrSHuoCbfw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ClassSortRule.pm b/Koha/Schema/Result/ClassSortRule.pm
index 567c01a..c952ae2 100644
--- a/Koha/Schema/Result/ClassSortRule.pm
+++ b/Koha/Schema/Result/ClassSortRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ClassSortRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ClassSortRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<class_sort_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::ClassSortRule
 
 =cut
 
@@ -52,17 +48,6 @@ __PACKAGE__->add_columns(
   "sort_routine",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 30 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</class_sort_rule>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("class_sort_rule");
 
 =head1 RELATIONS
@@ -83,8 +68,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xvTm4GLMb6N4qHQEv8EhSw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/rw7LlI3ti5wCJA7AY1EHA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ClassSource.pm b/Koha/Schema/Result/ClassSource.pm
index a0b27cd..a4c4131 100644
--- a/Koha/Schema/Result/ClassSource.pm
+++ b/Koha/Schema/Result/ClassSource.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ClassSource;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ClassSource
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<class_sources>
+
+=head1 NAME
+
+Koha::Schema::Result::ClassSource
 
 =cut
 
@@ -67,17 +63,6 @@ __PACKAGE__->add_columns(
     size => 10,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</cn_source>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("cn_source");
 
 =head1 RELATIONS
@@ -94,12 +79,12 @@ __PACKAGE__->belongs_to(
   "class_sort_rule",
   "Koha::Schema::Result::ClassSortRule",
   { class_sort_rule => "class_sort_rule" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OPkfouKUejU6oCgy58yt6Q
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PjU4+iPhalcPDlFW7PdjKg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Collection.pm b/Koha/Schema/Result/Collection.pm
index 92b0f6c..46d9bc6 100644
--- a/Koha/Schema/Result/Collection.pm
+++ b/Koha/Schema/Result/Collection.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Collection;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Collection
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<collections>
+
+=head1 NAME
+
+Koha::Schema::Result::Collection
 
 =cut
 
@@ -47,8 +43,6 @@ __PACKAGE__->table("collections");
   is_nullable: 1
   size: 4
 
-branchcode for branch where item should be held.
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -61,22 +55,11 @@ __PACKAGE__->add_columns(
   "colbranchcode",
   { data_type => "varchar", is_nullable => 1, size => 4 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</colid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("colid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KNJIC+I4OdfXBAPM8zOB4A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T4i5yX4nUrf/jXg9FNX57Q
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CollectionTracking.pm b/Koha/Schema/Result/CollectionTracking.pm
index 907ff68..892a4ae 100644
--- a/Koha/Schema/Result/CollectionTracking.pm
+++ b/Koha/Schema/Result/CollectionTracking.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CollectionTracking;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CollectionTracking
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<collections_tracking>
+
+=head1 NAME
+
+Koha::Schema::Result::CollectionTracking
 
 =cut
 
@@ -35,16 +31,12 @@ __PACKAGE__->table("collections_tracking");
   default_value: 0
   is_nullable: 0
 
-collections.colId
-
 =head2 itemnumber
 
   data_type: 'integer'
   default_value: 0
   is_nullable: 0
 
-items.itemnumber
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -55,22 +47,11 @@ __PACKAGE__->add_columns(
   "itemnumber",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</ctid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("ctid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:izGaZGUJvwrRTQOCotopUg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8rFlADk9TT1snPmfWhxHOQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Course.pm b/Koha/Schema/Result/Course.pm
index ceef5bc..b19abe1 100644
--- a/Koha/Schema/Result/Course.pm
+++ b/Koha/Schema/Result/Course.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Course;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Course
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<courses>
+
+=head1 NAME
+
+Koha::Schema::Result::Course
 
 =cut
 
@@ -85,7 +81,6 @@ __PACKAGE__->table("courses");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -119,23 +114,11 @@ __PACKAGE__->add_columns(
   },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</course_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("course_id");
 
 =head1 RELATIONS
@@ -170,19 +153,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 borrowernumbers
-
-Type: many_to_many
-
-Composing rels: L</course_instructors> -> borrowernumber
-
-=cut
-
-__PACKAGE__->many_to_many("borrowernumbers", "course_instructors", "borrowernumber");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:crKCFQ80qo2p885ebiBfnw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eQ9C7EgRkPcGhO/32fmbgg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CourseInstructor.pm b/Koha/Schema/Result/CourseInstructor.pm
index c1d183c..d8acf09 100644
--- a/Koha/Schema/Result/CourseInstructor.pm
+++ b/Koha/Schema/Result/CourseInstructor.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CourseInstructor;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CourseInstructor
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<course_instructors>
+
+=head1 NAME
+
+Koha::Schema::Result::CourseInstructor
 
 =cut
 
@@ -43,19 +39,6 @@ __PACKAGE__->add_columns(
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</course_id>
-
-=item * L</borrowernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("course_id", "borrowernumber");
 
 =head1 RELATIONS
@@ -72,7 +55,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 course
@@ -87,12 +70,12 @@ __PACKAGE__->belongs_to(
   "course",
   "Koha::Schema::Result::Course",
   { course_id => "course_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dIemqF/uRWLNN4IMCHZxRA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:U3VpKzGFC9YzwhTWuo3oWA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CourseItem.pm b/Koha/Schema/Result/CourseItem.pm
index a37263d..fe32afd 100644
--- a/Koha/Schema/Result/CourseItem.pm
+++ b/Koha/Schema/Result/CourseItem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CourseItem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CourseItem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<course_items>
+
+=head1 NAME
+
+Koha::Schema::Result::CourseItem
 
 =cut
 
@@ -70,7 +66,6 @@ __PACKAGE__->table("course_items");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -98,79 +93,49 @@ __PACKAGE__->add_columns(
   },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</ci_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("ci_id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<itemnumber>
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("itemnumber", ["itemnumber"]);
 
 =head1 RELATIONS
 
-=head2 holdingbranch
+=head2 itemnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Item>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "holdingbranch",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "holdingbranch" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "itemnumber",
+  "Koha::Schema::Result::Item",
+  { itemnumber => "itemnumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 itemnumber
+=head2 holdingbranch
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Item>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "itemnumber",
-  "Koha::Schema::Result::Item",
-  { itemnumber => "itemnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "holdingbranch",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "holdingbranch" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iVWZfUWcPfrLdLdvjyvbow
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hRFh/URYYxT1splXwGNtFQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CourseReserve.pm b/Koha/Schema/Result/CourseReserve.pm
index bb937b2..367ec74 100644
--- a/Koha/Schema/Result/CourseReserve.pm
+++ b/Koha/Schema/Result/CourseReserve.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CourseReserve;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CourseReserve
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<course_reserves>
+
+=head1 NAME
+
+Koha::Schema::Result::CourseReserve
 
 =cut
 
@@ -53,7 +49,6 @@ __PACKAGE__->table("course_reserves");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -72,39 +67,12 @@ __PACKAGE__->add_columns(
   { data_type => "mediumtext", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</cr_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("cr_id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<pseudo_key>
-
-=over 4
-
-=item * L</course_id>
-
-=item * L</ci_id>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("pseudo_key", ["course_id", "ci_id"]);
 
 =head1 RELATIONS
@@ -121,12 +89,12 @@ __PACKAGE__->belongs_to(
   "course",
   "Koha::Schema::Result::Course",
   { course_id => "course_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9KuuUyFReuw+PAlLW84yXQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6SjSSX2huUywaFk17VNiPw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CreatorBatch.pm b/Koha/Schema/Result/CreatorBatch.pm
index 3fdc97c..a403f64 100644
--- a/Koha/Schema/Result/CreatorBatch.pm
+++ b/Koha/Schema/Result/CreatorBatch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CreatorBatch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CreatorBatch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<creator_batches>
+
+=head1 NAME
+
+Koha::Schema::Result::CreatorBatch
 
 =cut
 
@@ -50,7 +46,6 @@ __PACKAGE__->table("creator_batches");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -82,10 +77,9 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "branch_code",
   {
@@ -103,17 +97,6 @@ __PACKAGE__->add_columns(
     size => 15,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</label_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("label_id");
 
 =head1 RELATIONS
@@ -130,12 +113,7 @@ __PACKAGE__->belongs_to(
   "borrower_number",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrower_number" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 branch_code
@@ -150,7 +128,7 @@ __PACKAGE__->belongs_to(
   "branch_code",
   "Koha::Schema::Result::Branch",
   { branchcode => "branch_code" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 item_number
@@ -165,17 +143,12 @@ __PACKAGE__->belongs_to(
   "item_number",
   "Koha::Schema::Result::Item",
   { itemnumber => "item_number" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:w5Nfrm8a8ajsC0bLBACaWg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aqixTsHht+4p/5RurH0OFA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CreatorImage.pm b/Koha/Schema/Result/CreatorImage.pm
index 70a669e..fd43ed0 100644
--- a/Koha/Schema/Result/CreatorImage.pm
+++ b/Koha/Schema/Result/CreatorImage.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CreatorImage;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CreatorImage
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<creator_images>
+
+=head1 NAME
+
+Koha::Schema::Result::CreatorImage
 
 =cut
 
@@ -56,36 +52,12 @@ __PACKAGE__->add_columns(
     size => 20,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</image_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("image_id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<image_name_index>
-
-=over 4
-
-=item * L</image_name>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("image_name_index", ["image_name"]);
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:veljpS1CT3wfNDilccroGg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2Dsr9dITJY0P8n5dpnEe9g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CreatorLayout.pm b/Koha/Schema/Result/CreatorLayout.pm
index 5dc03d4..1866cc2 100644
--- a/Koha/Schema/Result/CreatorLayout.pm
+++ b/Koha/Schema/Result/CreatorLayout.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CreatorLayout;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CreatorLayout
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<creator_layouts>
+
+=head1 NAME
+
+Koha::Schema::Result::CreatorLayout
 
 =cut
 
@@ -166,22 +162,11 @@ __PACKAGE__->add_columns(
     size => 15,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</layout_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("layout_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MNE/WVsvlJXO5IHiM64yPQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eMz2GIC9Uzox9rsPgRTBJw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/CreatorTemplate.pm b/Koha/Schema/Result/CreatorTemplate.pm
index b96c64d..a91d6ea 100644
--- a/Koha/Schema/Result/CreatorTemplate.pm
+++ b/Koha/Schema/Result/CreatorTemplate.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::CreatorTemplate;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::CreatorTemplate
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<creator_templates>
+
+=head1 NAME
+
+Koha::Schema::Result::CreatorTemplate
 
 =cut
 
@@ -189,22 +185,11 @@ __PACKAGE__->add_columns(
     size => 15,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</template_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("template_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2NGDs68pqskZaoiyURPIGg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/LO4D5MbycdlsoNENhVZ+w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Currency.pm b/Koha/Schema/Result/Currency.pm
index 7528869..1d8952b 100644
--- a/Koha/Schema/Result/Currency.pm
+++ b/Koha/Schema/Result/Currency.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Currency;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Currency
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<currency>
+
+=head1 NAME
+
+Koha::Schema::Result::Currency
 
 =cut
 
@@ -39,7 +35,6 @@ __PACKAGE__->table("currency");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -63,32 +58,20 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 5 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "rate",
   { data_type => "float", is_nullable => 1, size => [15, 5] },
   "active",
   { data_type => "tinyint", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</currency>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("currency");
 
 =head1 RELATIONS
 
-=head2 aqbooksellers_invoiceprices
+=head2 aqbooksellers_listprices
 
 Type: has_many
 
@@ -97,13 +80,13 @@ Related object: L<Koha::Schema::Result::Aqbookseller>
 =cut
 
 __PACKAGE__->has_many(
-  "aqbooksellers_invoiceprices",
+  "aqbooksellers_listprices",
   "Koha::Schema::Result::Aqbookseller",
-  { "foreign.invoiceprice" => "self.currency" },
+  { "foreign.listprice" => "self.currency" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 aqbooksellers_listprices
+=head2 aqbooksellers_invoiceprices
 
 Type: has_many
 
@@ -112,15 +95,15 @@ Related object: L<Koha::Schema::Result::Aqbookseller>
 =cut
 
 __PACKAGE__->has_many(
-  "aqbooksellers_listprices",
+  "aqbooksellers_invoiceprices",
   "Koha::Schema::Result::Aqbookseller",
-  { "foreign.listprice" => "self.currency" },
+  { "foreign.invoiceprice" => "self.currency" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1fpLJHtP0bseXVfytxii5Q
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AMEuM9G+j0dVq6Hf0KRVLw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/DefaultBorrowerCircRule.pm b/Koha/Schema/Result/DefaultBorrowerCircRule.pm
index 0f9c8f1..97dcdac 100644
--- a/Koha/Schema/Result/DefaultBorrowerCircRule.pm
+++ b/Koha/Schema/Result/DefaultBorrowerCircRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::DefaultBorrowerCircRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::DefaultBorrowerCircRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<default_borrower_circ_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::DefaultBorrowerCircRule
 
 =cut
 
@@ -43,17 +39,6 @@ __PACKAGE__->add_columns(
   "maxissueqty",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</categorycode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("categorycode");
 
 =head1 RELATIONS
@@ -70,12 +55,12 @@ __PACKAGE__->belongs_to(
   "categorycode",
   "Koha::Schema::Result::Category",
   { categorycode => "categorycode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bZVuSuLu0IxPcJMaUUjbSw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GriiXWrKJmfukSMz568auw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/DefaultBranchCircRule.pm b/Koha/Schema/Result/DefaultBranchCircRule.pm
index 55fd2b2..3a7e5f9 100644
--- a/Koha/Schema/Result/DefaultBranchCircRule.pm
+++ b/Koha/Schema/Result/DefaultBranchCircRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::DefaultBranchCircRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::DefaultBranchCircRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<default_branch_circ_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::DefaultBranchCircRule
 
 =cut
 
@@ -58,17 +54,6 @@ __PACKAGE__->add_columns(
   "returnbranch",
   { data_type => "varchar", is_nullable => 1, size => 15 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</branchcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("branchcode");
 
 =head1 RELATIONS
@@ -85,12 +70,12 @@ __PACKAGE__->belongs_to(
   "branchcode",
   "Koha::Schema::Result::Branch",
   { branchcode => "branchcode" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Uw1Y82CgbAY8ndLOucN70g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:edogwzFuNianNzfsv4cPjw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/DefaultBranchItemRule.pm b/Koha/Schema/Result/DefaultBranchItemRule.pm
index f31aa00..cbdf315 100644
--- a/Koha/Schema/Result/DefaultBranchItemRule.pm
+++ b/Koha/Schema/Result/DefaultBranchItemRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::DefaultBranchItemRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::DefaultBranchItemRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<default_branch_item_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::DefaultBranchItemRule
 
 =cut
 
@@ -51,17 +47,6 @@ __PACKAGE__->add_columns(
   "returnbranch",
   { data_type => "varchar", is_nullable => 1, size => 15 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemtype>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemtype");
 
 =head1 RELATIONS
@@ -78,12 +63,12 @@ __PACKAGE__->belongs_to(
   "itemtype",
   "Koha::Schema::Result::Itemtype",
   { itemtype => "itemtype" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Mm4EAx13qTr5S02B9dt01g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2vwyB6YgxSjhjtJJD8kA2A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/DefaultCircRule.pm b/Koha/Schema/Result/DefaultCircRule.pm
index 7bd1564..6f8c191 100644
--- a/Koha/Schema/Result/DefaultCircRule.pm
+++ b/Koha/Schema/Result/DefaultCircRule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::DefaultCircRule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::DefaultCircRule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<default_circ_rules>
+
+=head1 NAME
+
+Koha::Schema::Result::DefaultCircRule
 
 =cut
 
@@ -63,22 +59,11 @@ __PACKAGE__->add_columns(
   "returnbranch",
   { data_type => "varchar", is_nullable => 1, size => 15 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</singleton>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("singleton");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:I4hY1uJ+wDoWPIiZj5amVg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:O5jD6cDSbMjGlevKVQm+9Q
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Deletedbiblio.pm b/Koha/Schema/Result/Deletedbiblio.pm
index 61adcd1..103ce65 100644
--- a/Koha/Schema/Result/Deletedbiblio.pm
+++ b/Koha/Schema/Result/Deletedbiblio.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Deletedbiblio;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Deletedbiblio
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<deletedbiblio>
+
+=head1 NAME
+
+Koha::Schema::Result::Deletedbiblio
 
 =cut
 
@@ -74,14 +70,12 @@ __PACKAGE__->table("deletedbiblio");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 datecreated
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =head2 abstract
@@ -112,32 +106,20 @@ __PACKAGE__->add_columns(
   { data_type => "smallint", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "datecreated",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 0 },
+  { data_type => "date", is_nullable => 0 },
   "abstract",
   { data_type => "mediumtext", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</biblionumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("biblionumber");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T381rHb43DPfZ7+d/WuSxQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ozFAH9LmT5tXbzDb2GQA6A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Deletedbiblioitem.pm b/Koha/Schema/Result/Deletedbiblioitem.pm
index 6d520ea..9b9d417 100644
--- a/Koha/Schema/Result/Deletedbiblioitem.pm
+++ b/Koha/Schema/Result/Deletedbiblioitem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Deletedbiblioitem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Deletedbiblioitem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<deletedbiblioitems>
+
+=head1 NAME
+
+Koha::Schema::Result::Deletedbiblioitem
 
 =cut
 
@@ -83,7 +79,6 @@ __PACKAGE__->table("deletedbiblioitems");
 =head2 volumedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 volumedesc
@@ -119,7 +114,6 @@ __PACKAGE__->table("deletedbiblioitems");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -239,7 +233,7 @@ __PACKAGE__->add_columns(
   "publishercode",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "volumedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "volumedesc",
   { data_type => "text", is_nullable => 1 },
   "collectiontitle",
@@ -254,10 +248,9 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "illus",
   { data_type => "varchar", is_nullable => 1, size => 255 },
@@ -292,22 +285,11 @@ __PACKAGE__->add_columns(
   "marcxml",
   { data_type => "longtext", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</biblioitemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("biblioitemnumber");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Cf/DeVzIpMybe0uNA4bNTQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fCbXU1+T8BWiZUHa7KMmoA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Deletedborrower.pm b/Koha/Schema/Result/Deletedborrower.pm
index 9ede8ac..6b03492 100644
--- a/Koha/Schema/Result/Deletedborrower.pm
+++ b/Koha/Schema/Result/Deletedborrower.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Deletedborrower;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Deletedborrower
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<deletedborrowers>
+
+=head1 NAME
+
+Koha::Schema::Result::Deletedborrower
 
 =cut
 
@@ -191,7 +187,6 @@ __PACKAGE__->table("deletedborrowers");
 =head2 dateofbirth
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branchcode
@@ -211,13 +206,11 @@ __PACKAGE__->table("deletedborrowers");
 =head2 dateenrolled
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 dateexpiry
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 gonenoaddress
@@ -233,7 +226,6 @@ __PACKAGE__->table("deletedborrowers");
 =head2 debarred
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 debarredcomment
@@ -461,21 +453,21 @@ __PACKAGE__->add_columns(
   "b_phone",
   { data_type => "mediumtext", is_nullable => 1 },
   "dateofbirth",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "branchcode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
   "categorycode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
   "dateenrolled",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "dateexpiry",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "gonenoaddress",
   { data_type => "tinyint", is_nullable => 1 },
   "lost",
   { data_type => "tinyint", is_nullable => 1 },
   "debarred",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "debarredcomment",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "contactname",
@@ -535,8 +527,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yA/UeNpbYIUrX/iWsF0NLw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yZigQkRfkF2okjnJxUm+tQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Deleteditem.pm b/Koha/Schema/Result/Deleteditem.pm
index be28986..60d32a6 100644
--- a/Koha/Schema/Result/Deleteditem.pm
+++ b/Koha/Schema/Result/Deleteditem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Deleteditem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Deleteditem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<deleteditems>
+
+=head1 NAME
+
+Koha::Schema::Result::Deleteditem
 
 =cut
 
@@ -50,7 +46,6 @@ __PACKAGE__->table("deleteditems");
 =head2 dateaccessioned
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 booksellerid
@@ -79,19 +74,16 @@ __PACKAGE__->table("deleteditems");
 =head2 replacementpricedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 datelastborrowed
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 datelastseen
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 stack
@@ -174,7 +166,6 @@ __PACKAGE__->table("deleteditems");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -193,7 +184,6 @@ __PACKAGE__->table("deleteditems");
 =head2 onloan
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 cn_source
@@ -271,7 +261,7 @@ __PACKAGE__->add_columns(
   "barcode",
   { data_type => "varchar", is_nullable => 1, size => 20 },
   "dateaccessioned",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "booksellerid",
   { data_type => "mediumtext", is_nullable => 1 },
   "homebranch",
@@ -281,11 +271,11 @@ __PACKAGE__->add_columns(
   "replacementprice",
   { data_type => "decimal", is_nullable => 1, size => [8, 2] },
   "replacementpricedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "datelastborrowed",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "datelastseen",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "stack",
   { data_type => "tinyint", is_nullable => 1 },
   "notforloan",
@@ -316,17 +306,16 @@ __PACKAGE__->add_columns(
   { data_type => "mediumtext", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "location",
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "permanent_location",
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "onloan",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "cn_source",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "cn_sort",
@@ -350,22 +339,11 @@ __PACKAGE__->add_columns(
   "marc",
   { data_type => "longblob", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemnumber");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dfUPy7ijJ/uh9+0AqKjSBw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GcKMAw4fpC+PimBoro+XSw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Ethnicity.pm b/Koha/Schema/Result/Ethnicity.pm
index 039fcb7..fe3c753 100644
--- a/Koha/Schema/Result/Ethnicity.pm
+++ b/Koha/Schema/Result/Ethnicity.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Ethnicity;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Ethnicity
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<ethnicity>
+
+=head1 NAME
+
+Koha::Schema::Result::Ethnicity
 
 =cut
 
@@ -44,22 +40,11 @@ __PACKAGE__->add_columns(
   "name",
   { data_type => "varchar", is_nullable => 1, size => 255 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</code>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("code");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HPwxTCHuS0ZYGSznK4laEA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SJXFCB/CvUt7Lsl/GpmyIg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ExportFormat.pm b/Koha/Schema/Result/ExportFormat.pm
index 0882bcf..79cfbf9 100644
--- a/Koha/Schema/Result/ExportFormat.pm
+++ b/Koha/Schema/Result/ExportFormat.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ExportFormat;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ExportFormat - Used for CSV export
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<export_format>
+
+=head1 NAME
+
+Koha::Schema::Result::ExportFormat
 
 =cut
 
@@ -40,7 +36,7 @@ __PACKAGE__->table("export_format");
   data_type: 'mediumtext'
   is_nullable: 0
 
-=head2 content
+=head2 marcfields
 
   data_type: 'mediumtext'
   is_nullable: 0
@@ -69,13 +65,6 @@ __PACKAGE__->table("export_format");
   is_nullable: 0
   size: 255
 
-=head2 type
-
-  data_type: 'varchar'
-  default_value: 'marc'
-  is_nullable: 1
-  size: 255
-
 =cut
 
 __PACKAGE__->add_columns(
@@ -85,7 +74,7 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 0, size => 255 },
   "description",
   { data_type => "mediumtext", is_nullable => 0 },
-  "content",
+  "marcfields",
   { data_type => "mediumtext", is_nullable => 0 },
   "csv_separator",
   { data_type => "varchar", is_nullable => 0, size => 2 },
@@ -95,30 +84,12 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 0, size => 2 },
   "encoding",
   { data_type => "varchar", is_nullable => 0, size => 255 },
-  "type",
-  {
-    data_type => "varchar",
-    default_value => "marc",
-    is_nullable => 1,
-    size => 255,
-  },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</export_format_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("export_format_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AJbxXXJBftCbSKm2E/ZTjA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jPBfECp+vDuzYLV2OSDUmQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Fieldmapping.pm b/Koha/Schema/Result/Fieldmapping.pm
index d0b8730..ad3ae2c 100644
--- a/Koha/Schema/Result/Fieldmapping.pm
+++ b/Koha/Schema/Result/Fieldmapping.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Fieldmapping;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Fieldmapping
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<fieldmapping>
+
+=head1 NAME
+
+Koha::Schema::Result::Fieldmapping
 
 =cut
 
@@ -68,22 +64,11 @@ __PACKAGE__->add_columns(
   "subfieldcode",
   { data_type => "char", is_nullable => 0, size => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:x+izN6nqxs+W/g/demOpOg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zx+/j3958nV4wa+alR9iUQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/HoldFillTarget.pm b/Koha/Schema/Result/HoldFillTarget.pm
index b6735b6..395b4aa 100644
--- a/Koha/Schema/Result/HoldFillTarget.pm
+++ b/Koha/Schema/Result/HoldFillTarget.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::HoldFillTarget;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::HoldFillTarget
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<hold_fill_targets>
+
+=head1 NAME
+
+Koha::Schema::Result::HoldFillTarget
 
 =cut
 
@@ -68,49 +64,38 @@ __PACKAGE__->add_columns(
   "item_level_request",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemnumber");
 
 =head1 RELATIONS
 
-=head2 biblionumber
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Biblio>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "biblionumber",
-  "Koha::Schema::Result::Biblio",
-  { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 borrowernumber
+=head2 biblionumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Biblio>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "biblionumber",
+  "Koha::Schema::Result::Biblio",
+  { biblionumber => "biblionumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 itemnumber
@@ -125,7 +110,7 @@ __PACKAGE__->belongs_to(
   "itemnumber",
   "Koha::Schema::Result::Item",
   { itemnumber => "itemnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 source_branchcode
@@ -140,17 +125,12 @@ __PACKAGE__->belongs_to(
   "source_branchcode",
   "Koha::Schema::Result::Branch",
   { branchcode => "source_branchcode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uSU9PBMr4e6XKuDgBV583A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pIucZXhr+50M61306nqWAA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportAuth.pm b/Koha/Schema/Result/ImportAuth.pm
index a8fc448..e9b134d 100644
--- a/Koha/Schema/Result/ImportAuth.pm
+++ b/Koha/Schema/Result/ImportAuth.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportAuth;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportAuth
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_auths>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportAuth
 
 =cut
 
@@ -81,12 +77,12 @@ __PACKAGE__->belongs_to(
   "import_record",
   "Koha::Schema::Result::ImportRecord",
   { import_record_id => "import_record_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:bm1ctlmYDh4qWUU95SLqBw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Tp2nY6gyIIfdSJrLysYqzA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportBatch.pm b/Koha/Schema/Result/ImportBatch.pm
index 5413d39..1f13492 100644
--- a/Koha/Schema/Result/ImportBatch.pm
+++ b/Koha/Schema/Result/ImportBatch.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportBatch;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportBatch
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_batches>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportBatch
 
 =cut
 
@@ -60,7 +56,6 @@ __PACKAGE__->table("import_batches");
 =head2 upload_timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -82,7 +77,7 @@ __PACKAGE__->table("import_batches");
 
   data_type: 'enum'
   default_value: 'always_add'
-  extra: {list => ["always_add","add_only_for_matches","add_only_for_new","ignore","replace"]}
+  extra: {list => ["always_add","add_only_for_matches","add_only_for_new","ignore"]}
   is_nullable: 0
 
 =head2 import_status
@@ -134,10 +129,9 @@ __PACKAGE__->add_columns(
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "upload_timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "overlay_action",
   {
@@ -163,7 +157,6 @@ __PACKAGE__->add_columns(
         "add_only_for_matches",
         "add_only_for_new",
         "ignore",
-        "replace",
       ],
     },
     is_nullable => 0,
@@ -204,17 +197,6 @@ __PACKAGE__->add_columns(
   "comments",
   { data_type => "mediumtext", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</import_batch_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("import_batch_id");
 
 =head1 RELATIONS
@@ -235,8 +217,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.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:pEJic1YMNUgKTVlI7vcekw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportBiblio.pm b/Koha/Schema/Result/ImportBiblio.pm
index 1b6c50d..e05bef8 100644
--- a/Koha/Schema/Result/ImportBiblio.pm
+++ b/Koha/Schema/Result/ImportBiblio.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportBiblio;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportBiblio
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_biblios>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportBiblio
 
 =cut
 
@@ -113,12 +109,12 @@ __PACKAGE__->belongs_to(
   "import_record",
   "Koha::Schema::Result::ImportRecord",
   { import_record_id => "import_record_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6dQmL78YztbxS9qXHciPTQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:90uDU3qRPuZBaaXwkGO5AA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportItem.pm b/Koha/Schema/Result/ImportItem.pm
index 2949e36..22fd818 100644
--- a/Koha/Schema/Result/ImportItem.pm
+++ b/Koha/Schema/Result/ImportItem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportItem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportItem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_items>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportItem
 
 =cut
 
@@ -86,17 +82,6 @@ __PACKAGE__->add_columns(
   "import_error",
   { data_type => "mediumtext", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</import_items_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("import_items_id");
 
 =head1 RELATIONS
@@ -113,12 +98,12 @@ __PACKAGE__->belongs_to(
   "import_record",
   "Koha::Schema::Result::ImportRecord",
   { import_record_id => "import_record_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xJd76DD3iljc4uFm7iZeLQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yggV+XKPL5OX1PCuwCpOcA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportRecord.pm b/Koha/Schema/Result/ImportRecord.pm
index c010138..996d6b3 100644
--- a/Koha/Schema/Result/ImportRecord.pm
+++ b/Koha/Schema/Result/ImportRecord.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportRecord;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportRecord
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_records>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportRecord
 
 =cut
 
@@ -50,14 +46,12 @@ __PACKAGE__->table("import_records");
 =head2 upload_timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 import_date
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 marc
@@ -127,13 +121,12 @@ __PACKAGE__->add_columns(
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "upload_timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "import_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "marc",
   { data_type => "longblob", is_nullable => 0 },
   "marcxml",
@@ -179,17 +172,6 @@ __PACKAGE__->add_columns(
   "z3950random",
   { data_type => "varchar", is_nullable => 1, size => 40 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</import_record_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("import_record_id");
 
 =head1 RELATIONS
@@ -209,21 +191,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 import_batch
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::ImportBatch>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "import_batch",
-  "Koha::Schema::Result::ImportBatch",
-  { import_batch_id => "import_batch_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
-
 =head2 import_biblios
 
 Type: has_many
@@ -269,9 +236,24 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
+=head2 import_batch
+
+Type: belongs_to
+
+Related object: L<Koha::Schema::Result::ImportBatch>
+
+=cut
+
+__PACKAGE__->belongs_to(
+  "import_batch",
+  "Koha::Schema::Result::ImportBatch",
+  { import_batch_id => "import_batch_id" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:e71umJ0QmfPBvlxmzbClng
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2mhdPG0lhQ2+CqYzXcoBiw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ImportRecordMatches.pm b/Koha/Schema/Result/ImportRecordMatches.pm
index 934e381..2fb4e4b 100644
--- a/Koha/Schema/Result/ImportRecordMatches.pm
+++ b/Koha/Schema/Result/ImportRecordMatches.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ImportRecordMatches;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ImportRecordMatches
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<import_record_matches>
+
+=head1 NAME
+
+Koha::Schema::Result::ImportRecordMatches
 
 =cut
 
@@ -65,12 +61,12 @@ __PACKAGE__->belongs_to(
   "import_record",
   "Koha::Schema::Result::ImportRecord",
   { import_record_id => "import_record_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VLaEo7f96O80PqFr/baR9A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2iJH02loa+ULjaff8QWFwA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Issue.pm b/Koha/Schema/Result/Issue.pm
index 282c802..be92c8a 100644
--- a/Koha/Schema/Result/Issue.pm
+++ b/Koha/Schema/Result/Issue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Issue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Issue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<issues>
+
+=head1 NAME
+
+Koha::Schema::Result::Issue
 
 =cut
 
@@ -23,6 +19,12 @@ __PACKAGE__->table("issues");
 
 =head1 ACCESSORS
 
+=head2 issue_id
+
+  data_type: 'integer'
+  is_auto_increment: 1
+  is_nullable: 0
+
 =head2 borrowernumber
 
   data_type: 'integer'
@@ -38,7 +40,6 @@ __PACKAGE__->table("issues");
 =head2 date_due
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branchcode
@@ -56,13 +57,11 @@ __PACKAGE__->table("issues");
 =head2 returndate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 lastreneweddate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 return
@@ -79,63 +78,47 @@ __PACKAGE__->table("issues");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 issuedate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
 
 __PACKAGE__->add_columns(
+  "issue_id",
+  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "itemnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "date_due",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "branchcode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "issuingbranch",
   { data_type => "varchar", is_nullable => 1, size => 18 },
   "returndate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "lastreneweddate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "return",
   { data_type => "varchar", is_nullable => 1, size => 4 },
   "renewals",
   { data_type => "tinyint", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "issuedate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
+__PACKAGE__->set_primary_key("issue_id");
 
 =head1 RELATIONS
 
@@ -151,12 +134,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 itemnumber
@@ -171,17 +149,12 @@ __PACKAGE__->belongs_to(
   "itemnumber",
   "Koha::Schema::Result::Item",
   { itemnumber => "itemnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZEh31EKBmURMKxDxI+H3EA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tvpuw8k1hjh2nbOsng5k/w
 
 __PACKAGE__->belongs_to(
   "borrower",
diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm
index aaaabb4..f2b710d 100644
--- a/Koha/Schema/Result/Issuingrule.pm
+++ b/Koha/Schema/Result/Issuingrule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Issuingrule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Issuingrule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<issuingrules>
+
+=head1 NAME
+
+Koha::Schema::Result::Issuingrule
 
 =cut
 
@@ -106,7 +102,6 @@ __PACKAGE__->table("issuingrules");
 =head2 hardduedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 hardduedatecompare
@@ -182,7 +177,7 @@ __PACKAGE__->add_columns(
     size => 10,
   },
   "hardduedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "hardduedatecompare",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "renewalsallowed",
@@ -196,26 +191,11 @@ __PACKAGE__->add_columns(
   "overduefinescap",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</branchcode>
-
-=item * L</categorycode>
-
-=item * L</itemtype>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("branchcode", "categorycode", "itemtype");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aq0+Nbs8f4j1SeQwc+kKRg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WQvxhQ7mZ7F3LmdScYNPmw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm
index 055f801..2316e7e 100644
--- a/Koha/Schema/Result/Item.pm
+++ b/Koha/Schema/Result/Item.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Item;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Item
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<items>
+
+=head1 NAME
+
+Koha::Schema::Result::Item
 
 =cut
 
@@ -51,7 +47,6 @@ __PACKAGE__->table("items");
 =head2 dateaccessioned
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 booksellerid
@@ -81,19 +76,16 @@ __PACKAGE__->table("items");
 =head2 replacementpricedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 datelastborrowed
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 datelastseen
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 stack
@@ -177,7 +169,6 @@ __PACKAGE__->table("items");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -196,7 +187,6 @@ __PACKAGE__->table("items");
 =head2 onloan
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 cn_source
@@ -273,7 +263,7 @@ __PACKAGE__->add_columns(
   "barcode",
   { data_type => "varchar", is_nullable => 1, size => 20 },
   "dateaccessioned",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "booksellerid",
   { data_type => "mediumtext", is_nullable => 1 },
   "homebranch",
@@ -283,11 +273,11 @@ __PACKAGE__->add_columns(
   "replacementprice",
   { data_type => "decimal", is_nullable => 1, size => [8, 2] },
   "replacementpricedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "datelastborrowed",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "datelastseen",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "stack",
   { data_type => "tinyint", is_nullable => 1 },
   "notforloan",
@@ -318,17 +308,16 @@ __PACKAGE__->add_columns(
   { data_type => "mediumtext", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "location",
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "permanent_location",
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "onloan",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "cn_source",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "cn_sort",
@@ -350,31 +339,7 @@ __PACKAGE__->add_columns(
   "stocknumber",
   { data_type => "varchar", is_nullable => 1, size => 32 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemnumber");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<itembarcodeidx>
-
-=over 4
-
-=item * L</barcode>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("itembarcodeidx", ["barcode"]);
 
 =head1 RELATIONS
@@ -394,21 +359,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 biblioitemnumber
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Biblioitem>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "biblioitemnumber",
-  "Koha::Schema::Result::Biblioitem",
-  { biblioitemnumber => "biblioitemnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
-
 =head2 branchtransfers
 
 Type: has_many
@@ -469,24 +419,34 @@ __PACKAGE__->might_have(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 holdingbranch
+=head2 issues
+
+Type: has_many
+
+Related object: L<Koha::Schema::Result::Issue>
+
+=cut
+
+__PACKAGE__->has_many(
+  "issues",
+  "Koha::Schema::Result::Issue",
+  { "foreign.itemnumber" => "self.itemnumber" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
+=head2 biblioitemnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Branch>
+Related object: L<Koha::Schema::Result::Biblioitem>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "holdingbranch",
-  "Koha::Schema::Result::Branch",
-  { branchcode => "holdingbranch" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "biblioitemnumber",
+  "Koha::Schema::Result::Biblioitem",
+  { biblioitemnumber => "biblioitemnumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 homebranch
@@ -501,27 +461,22 @@ __PACKAGE__->belongs_to(
   "homebranch",
   "Koha::Schema::Result::Branch",
   { branchcode => "homebranch" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 issues
+=head2 holdingbranch
 
-Type: has_many
+Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Issue>
+Related object: L<Koha::Schema::Result::Branch>
 
 =cut
 
-__PACKAGE__->has_many(
-  "issues",
-  "Koha::Schema::Result::Issue",
-  { "foreign.itemnumber" => "self.itemnumber" },
-  { cascade_copy => 0, cascade_delete => 0 },
+__PACKAGE__->belongs_to(
+  "holdingbranch",
+  "Koha::Schema::Result::Branch",
+  { branchcode => "holdingbranch" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 old_issues
@@ -585,8 +540,8 @@ __PACKAGE__->might_have(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JV1Q/UVlKQ6QgVFMGBIZCw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zb/+LZ2AK8v+ceCRqJOmZw
 
 __PACKAGE__->belongs_to(
     "biblio",
diff --git a/Koha/Schema/Result/ItemCirculationAlertPreference.pm b/Koha/Schema/Result/ItemCirculationAlertPreference.pm
index d7fdf31..11096ee 100644
--- a/Koha/Schema/Result/ItemCirculationAlertPreference.pm
+++ b/Koha/Schema/Result/ItemCirculationAlertPreference.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ItemCirculationAlertPreference;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ItemCirculationAlertPreference
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<item_circulation_alert_preferences>
+
+=head1 NAME
+
+Koha::Schema::Result::ItemCirculationAlertPreference
 
 =cut
 
@@ -67,22 +63,11 @@ __PACKAGE__->add_columns(
   "notification",
   { data_type => "varchar", is_nullable => 0, size => 16 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1JO3F3Wc1jjqKR3jzx2eiw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:si77ywP244wbsohR490vpQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Itemtype.pm b/Koha/Schema/Result/Itemtype.pm
index 67f64c5..89d95a2 100644
--- a/Koha/Schema/Result/Itemtype.pm
+++ b/Koha/Schema/Result/Itemtype.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Itemtype;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Itemtype
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<itemtypes>
+
+=head1 NAME
+
+Koha::Schema::Result::Itemtype
 
 =cut
 
@@ -95,17 +91,6 @@ __PACKAGE__->add_columns(
     size => 16,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</itemtype>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("itemtype");
 
 =head1 RELATIONS
@@ -141,8 +126,8 @@ __PACKAGE__->might_have(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BmFEWUxi2Ha50Hv6nQhDKQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jL4vwjVo/Xoy0Lsq9Cq2sw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/LanguageDescription.pm b/Koha/Schema/Result/LanguageDescription.pm
index aed9cb6..dde2ded 100644
--- a/Koha/Schema/Result/LanguageDescription.pm
+++ b/Koha/Schema/Result/LanguageDescription.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::LanguageDescription;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::LanguageDescription
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<language_descriptions>
+
+=head1 NAME
+
+Koha::Schema::Result::LanguageDescription
 
 =cut
 
@@ -67,22 +63,11 @@ __PACKAGE__->add_columns(
   "id",
   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fQEN7ks3f7aLuoDQWqEv+Q
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1pL9MoNMHVtgZ7f4rvfC7A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/LanguageRfc4646ToIso639.pm b/Koha/Schema/Result/LanguageRfc4646ToIso639.pm
index 0ec143c..b893afb 100644
--- a/Koha/Schema/Result/LanguageRfc4646ToIso639.pm
+++ b/Koha/Schema/Result/LanguageRfc4646ToIso639.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::LanguageRfc4646ToIso639;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::LanguageRfc4646ToIso639
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<language_rfc4646_to_iso639>
+
+=head1 NAME
+
+Koha::Schema::Result::LanguageRfc4646ToIso639
 
 =cut
 
@@ -51,22 +47,11 @@ __PACKAGE__->add_columns(
   "id",
   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:80baGnx1j4ZZjs0Qn5VMsw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DIo2SjNbR4SAshupeHNGUw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/LanguageScriptBidi.pm b/Koha/Schema/Result/LanguageScriptBidi.pm
index 7272374..3676d94 100644
--- a/Koha/Schema/Result/LanguageScriptBidi.pm
+++ b/Koha/Schema/Result/LanguageScriptBidi.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::LanguageScriptBidi;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::LanguageScriptBidi
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<language_script_bidi>
+
+=head1 NAME
+
+Koha::Schema::Result::LanguageScriptBidi
 
 =cut
 
@@ -45,8 +41,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TBR2kCdB/nvEcdDo8I4rQA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:a+0c1CTsVC0hkwmqXZoMbA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/LanguageScriptMapping.pm b/Koha/Schema/Result/LanguageScriptMapping.pm
index a43ecc0..8a62818 100644
--- a/Koha/Schema/Result/LanguageScriptMapping.pm
+++ b/Koha/Schema/Result/LanguageScriptMapping.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::LanguageScriptMapping;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::LanguageScriptMapping
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<language_script_mapping>
+
+=head1 NAME
+
+Koha::Schema::Result::LanguageScriptMapping
 
 =cut
 
@@ -45,8 +41,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:c9gZ400zs7OkvI1JDCjyCg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fd7zBk+6UaBq+FZhMBghzA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/LanguageSubtagRegistry.pm b/Koha/Schema/Result/LanguageSubtagRegistry.pm
index b937802..635321a 100644
--- a/Koha/Schema/Result/LanguageSubtagRegistry.pm
+++ b/Koha/Schema/Result/LanguageSubtagRegistry.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::LanguageSubtagRegistry;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::LanguageSubtagRegistry
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<language_subtag_registry>
+
+=head1 NAME
+
+Koha::Schema::Result::LanguageSubtagRegistry
 
 =cut
 
@@ -44,7 +40,6 @@ __PACKAGE__->table("language_subtag_registry");
 =head2 added
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 id
@@ -63,26 +58,15 @@ __PACKAGE__->add_columns(
   "description",
   { data_type => "varchar", is_nullable => 1, size => 25 },
   "added",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "id",
   { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Rauj/sMGM6sskKuMC/XRcQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OOyjUaY5McrqWBXInueG2A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Letter.pm b/Koha/Schema/Result/Letter.pm
index 95345f7..795745f 100644
--- a/Koha/Schema/Result/Letter.pm
+++ b/Koha/Schema/Result/Letter.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Letter;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Letter
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<letter>
+
+=head1 NAME
+
+Koha::Schema::Result::Letter
 
 =cut
 
@@ -87,21 +83,6 @@ __PACKAGE__->add_columns(
   "content",
   { data_type => "text", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</module>
-
-=item * L</code>
-
-=item * L</branchcode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("module", "code", "branchcode");
 
 =head1 RELATIONS
@@ -126,8 +107,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Lc0RfG7k0QwnWCDywFImLg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EsZAQqfiyVz5Ts/xNowFcQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Linktracker.pm b/Koha/Schema/Result/Linktracker.pm
index a1ca30a..fba5ac3 100644
--- a/Koha/Schema/Result/Linktracker.pm
+++ b/Koha/Schema/Result/Linktracker.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Linktracker;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Linktracker
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<linktracker>
+
+=head1 NAME
+
+Koha::Schema::Result::Linktracker
 
 =cut
 
@@ -52,7 +48,6 @@ __PACKAGE__->table("linktracker");
 =head2 timeclicked
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -69,28 +64,13 @@ __PACKAGE__->add_columns(
   "url",
   { data_type => "text", is_nullable => 1 },
   "timeclicked",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4Ox7j2FHewUd09dX9i+T6w
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oWFq/xZiO4PyV252MIaY0w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MarcMatcher.pm b/Koha/Schema/Result/MarcMatcher.pm
index 3f1750a..c76f134 100644
--- a/Koha/Schema/Result/MarcMatcher.pm
+++ b/Koha/Schema/Result/MarcMatcher.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MarcMatcher;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MarcMatcher
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<marc_matchers>
+
+=head1 NAME
+
+Koha::Schema::Result::MarcMatcher
 
 =cut
 
@@ -75,17 +71,6 @@ __PACKAGE__->add_columns(
   "threshold",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</matcher_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("matcher_id");
 
 =head1 RELATIONS
@@ -136,8 +121,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2K4K9wfjRlJJKDztPgHJDA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:yYrEPc3D55gclg2TBbmgOQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MarcSubfieldStructure.pm b/Koha/Schema/Result/MarcSubfieldStructure.pm
index 3054d8d..07721bd 100644
--- a/Koha/Schema/Result/MarcSubfieldStructure.pm
+++ b/Koha/Schema/Result/MarcSubfieldStructure.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MarcSubfieldStructure;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MarcSubfieldStructure
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<marc_subfield_structure>
+
+=head1 NAME
+
+Koha::Schema::Result::MarcSubfieldStructure
 
 =cut
 
@@ -172,26 +168,11 @@ __PACKAGE__->add_columns(
   "maxlength",
   { data_type => "integer", default_value => 9999, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</frameworkcode>
-
-=item * L</tagfield>
-
-=item * L</tagsubfield>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("frameworkcode", "tagfield", "tagsubfield");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4JgqkPKFNSQ90hTeeb30ow
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:DoTLvCUUgWR8u2bSwoD1kQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MarcTagStructure.pm b/Koha/Schema/Result/MarcTagStructure.pm
index 8873ef3..0ad7081 100644
--- a/Koha/Schema/Result/MarcTagStructure.pm
+++ b/Koha/Schema/Result/MarcTagStructure.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MarcTagStructure;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MarcTagStructure
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<marc_tag_structure>
+
+=head1 NAME
+
+Koha::Schema::Result::MarcTagStructure
 
 =cut
 
@@ -87,24 +83,11 @@ __PACKAGE__->add_columns(
   "frameworkcode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 4 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</frameworkcode>
-
-=item * L</tagfield>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("frameworkcode", "tagfield");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TvdQBCX3rEhJxxqGcqrpWw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NScxQQdqEbp7o8jmljIehw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Matchcheck.pm b/Koha/Schema/Result/Matchcheck.pm
index 39b94f9..262e5d6 100644
--- a/Koha/Schema/Result/Matchcheck.pm
+++ b/Koha/Schema/Result/Matchcheck.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Matchcheck;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Matchcheck
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<matchchecks>
+
+=head1 NAME
+
+Koha::Schema::Result::Matchcheck
 
 =cut
 
@@ -59,17 +55,6 @@ __PACKAGE__->add_columns(
   "target_matchpoint_id",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</matchcheck_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("matchcheck_id");
 
 =head1 RELATIONS
@@ -86,7 +71,7 @@ __PACKAGE__->belongs_to(
   "matcher",
   "Koha::Schema::Result::MarcMatcher",
   { matcher_id => "matcher_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 source_matchpoint
@@ -101,7 +86,7 @@ __PACKAGE__->belongs_to(
   "source_matchpoint",
   "Koha::Schema::Result::Matchpoint",
   { matchpoint_id => "source_matchpoint_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 target_matchpoint
@@ -116,12 +101,12 @@ __PACKAGE__->belongs_to(
   "target_matchpoint",
   "Koha::Schema::Result::Matchpoint",
   { matchpoint_id => "target_matchpoint_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3G4E3DxiD6lCTP7a569BQg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1ubsZGCgABRQeLtXBkmslQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MatcherMatchpoint.pm b/Koha/Schema/Result/MatcherMatchpoint.pm
index 42dfdf0..3cdcb0d 100644
--- a/Koha/Schema/Result/MatcherMatchpoint.pm
+++ b/Koha/Schema/Result/MatcherMatchpoint.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MatcherMatchpoint;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MatcherMatchpoint
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<matcher_matchpoints>
+
+=head1 NAME
+
+Koha::Schema::Result::MatcherMatchpoint
 
 =cut
 
@@ -58,7 +54,7 @@ __PACKAGE__->belongs_to(
   "matcher",
   "Koha::Schema::Result::MarcMatcher",
   { matcher_id => "matcher_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 matchpoint
@@ -73,12 +69,12 @@ __PACKAGE__->belongs_to(
   "matchpoint",
   "Koha::Schema::Result::Matchpoint",
   { matchpoint_id => "matchpoint_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:W2mZNvJSe3CC0M52hqJsJg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:m5NgNKuWc8hK6qYt58WJ7w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Matchpoint.pm b/Koha/Schema/Result/Matchpoint.pm
index 3b85d9c..12047fe 100644
--- a/Koha/Schema/Result/Matchpoint.pm
+++ b/Koha/Schema/Result/Matchpoint.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Matchpoint;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Matchpoint
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<matchpoints>
+
+=head1 NAME
+
+Koha::Schema::Result::Matchpoint
 
 =cut
 
@@ -60,17 +56,6 @@ __PACKAGE__->add_columns(
   "score",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</matchpoint_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("matchpoint_id");
 
 =head1 RELATIONS
@@ -105,21 +90,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 matcher
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::MarcMatcher>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "matcher",
-  "Koha::Schema::Result::MarcMatcher",
-  { matcher_id => "matcher_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
-
 =head2 matcher_matchpoints
 
 Type: has_many
@@ -150,9 +120,24 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
+=head2 matcher
+
+Type: belongs_to
+
+Related object: L<Koha::Schema::Result::MarcMatcher>
+
+=cut
+
+__PACKAGE__->belongs_to(
+  "matcher",
+  "Koha::Schema::Result::MarcMatcher",
+  { matcher_id => "matcher_id" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KvZ0QM+OoJ+xaUKdkPGASg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4l0zCiX04HlyYtLjzyRAig
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MatchpointComponent.pm b/Koha/Schema/Result/MatchpointComponent.pm
index e3b2a65..8d0510b 100644
--- a/Koha/Schema/Result/MatchpointComponent.pm
+++ b/Koha/Schema/Result/MatchpointComponent.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MatchpointComponent;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MatchpointComponent
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<matchpoint_components>
+
+=head1 NAME
+
+Koha::Schema::Result::MatchpointComponent
 
 =cut
 
@@ -91,20 +87,26 @@ __PACKAGE__->add_columns(
   "length",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
 );
+__PACKAGE__->set_primary_key("matchpoint_component_id");
 
-=head1 PRIMARY KEY
+=head1 RELATIONS
 
-=over 4
+=head2 matchpoint_component_norms
 
-=item * L</matchpoint_component_id>
+Type: has_many
 
-=back
+Related object: L<Koha::Schema::Result::MatchpointComponentNorm>
 
 =cut
 
-__PACKAGE__->set_primary_key("matchpoint_component_id");
-
-=head1 RELATIONS
+__PACKAGE__->has_many(
+  "matchpoint_component_norms",
+  "Koha::Schema::Result::MatchpointComponentNorm",
+  {
+    "foreign.matchpoint_component_id" => "self.matchpoint_component_id",
+  },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 
 =head2 matchpoint
 
@@ -118,29 +120,12 @@ __PACKAGE__->belongs_to(
   "matchpoint",
   "Koha::Schema::Result::Matchpoint",
   { matchpoint_id => "matchpoint_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
-
-=head2 matchpoint_component_norms
-
-Type: has_many
-
-Related object: L<Koha::Schema::Result::MatchpointComponentNorm>
-
-=cut
-
-__PACKAGE__->has_many(
-  "matchpoint_component_norms",
-  "Koha::Schema::Result::MatchpointComponentNorm",
-  {
-    "foreign.matchpoint_component_id" => "self.matchpoint_component_id",
-  },
-  { cascade_copy => 0, cascade_delete => 0 },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R9niKe/wGJXD+ZVkIP5Wpg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ps466vmcyEitpjMqM7qa/A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MatchpointComponentNorm.pm b/Koha/Schema/Result/MatchpointComponentNorm.pm
index a885a7c..206bb66 100644
--- a/Koha/Schema/Result/MatchpointComponentNorm.pm
+++ b/Koha/Schema/Result/MatchpointComponentNorm.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MatchpointComponentNorm;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MatchpointComponentNorm
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<matchpoint_component_norms>
+
+=head1 NAME
+
+Koha::Schema::Result::MatchpointComponentNorm
 
 =cut
 
@@ -73,12 +69,12 @@ __PACKAGE__->belongs_to(
   "matchpoint_component",
   "Koha::Schema::Result::MatchpointComponent",
   { matchpoint_component_id => "matchpoint_component_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Aj5cUNNx7G5iq0w0AFVgtA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:35ISTi/NL/z/GhcnhwXXMQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Message.pm b/Koha/Schema/Result/Message.pm
index d596cb4..ba9f107 100644
--- a/Koha/Schema/Result/Message.pm
+++ b/Koha/Schema/Result/Message.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Message;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Message
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<messages>
+
+=head1 NAME
+
+Koha::Schema::Result::Message
 
 =cut
 
@@ -54,7 +50,6 @@ __PACKAGE__->table("messages");
 =head2 message_date
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -73,28 +68,16 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 0 },
   "message_date",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</message_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("message_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iq+Uo9eMnkDgUQsRR6VFUA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hThXo01h0VSbjJepDAEaRg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MessageAttribute.pm b/Koha/Schema/Result/MessageAttribute.pm
index 8fc01b3..64fb1d2 100644
--- a/Koha/Schema/Result/MessageAttribute.pm
+++ b/Koha/Schema/Result/MessageAttribute.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MessageAttribute;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MessageAttribute
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<message_attributes>
+
+=head1 NAME
+
+Koha::Schema::Result::MessageAttribute
 
 =cut
 
@@ -52,31 +48,7 @@ __PACKAGE__->add_columns(
   "takes_days",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</message_attribute_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("message_attribute_id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<message_name>
-
-=over 4
-
-=item * L</message_name>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("message_name", ["message_name"]);
 
 =head1 RELATIONS
@@ -112,8 +84,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:N033AvWwG2CDBDuTj2unqQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:A4UCx15D92JsfqIIdo7J9Q
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MessageQueue.pm b/Koha/Schema/Result/MessageQueue.pm
index 417cd78..a0ea79c 100644
--- a/Koha/Schema/Result/MessageQueue.pm
+++ b/Koha/Schema/Result/MessageQueue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MessageQueue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MessageQueue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<message_queue>
+
+=head1 NAME
+
+Koha::Schema::Result::MessageQueue
 
 =cut
 
@@ -73,7 +69,6 @@ __PACKAGE__->table("message_queue");
 =head2 time_queued
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -118,10 +113,9 @@ __PACKAGE__->add_columns(
   },
   "time_queued",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "to_address",
   { data_type => "mediumtext", is_nullable => 1 },
@@ -145,12 +139,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 message_transport_type
@@ -165,12 +154,12 @@ __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" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+gmGYPCtwCYKHAzfd9xByQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CpGYS1PRemUgwE95tvJitg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MessageTransport.pm b/Koha/Schema/Result/MessageTransport.pm
index 3a2f9a9..12f8c62 100644
--- a/Koha/Schema/Result/MessageTransport.pm
+++ b/Koha/Schema/Result/MessageTransport.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MessageTransport;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MessageTransport
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<message_transports>
+
+=head1 NAME
+
+Koha::Schema::Result::MessageTransport
 
 =cut
 
@@ -100,44 +96,10 @@ __PACKAGE__->add_columns(
     size => 10,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</message_attribute_id>
-
-=item * L</message_transport_type>
-
-=item * L</is_digest>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("message_attribute_id", "message_transport_type", "is_digest");
 
 =head1 RELATIONS
 
-=head2 letter
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Letter>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "letter",
-  "Koha::Schema::Result::Letter",
-  {
-    branchcode => "branchcode",
-    code => "letter_code",
-    module => "letter_module",
-  },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
-
 =head2 message_attribute
 
 Type: belongs_to
@@ -150,7 +112,7 @@ __PACKAGE__->belongs_to(
   "message_attribute",
   "Koha::Schema::Result::MessageAttribute",
   { message_attribute_id => "message_attribute_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 message_transport_type
@@ -165,12 +127,31 @@ __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" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
+=head2 letter
+
+Type: belongs_to
+
+Related object: L<Koha::Schema::Result::Letter>
+
+=cut
+
+__PACKAGE__->belongs_to(
+  "letter",
+  "Koha::Schema::Result::Letter",
+  {
+    branchcode => "branchcode",
+    code => "letter_code",
+    module => "letter_module",
+  },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:P4Bsq0A7/imUhRBRnD5HrQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uTLDy+O9IJpX4CmcaJmPMg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/MessageTransportType.pm b/Koha/Schema/Result/MessageTransportType.pm
index 8863a2d..90122fa 100644
--- a/Koha/Schema/Result/MessageTransportType.pm
+++ b/Koha/Schema/Result/MessageTransportType.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::MessageTransportType;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::MessageTransportType
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<message_transport_types>
+
+=head1 NAME
+
+Koha::Schema::Result::MessageTransportType
 
 =cut
 
@@ -35,17 +31,6 @@ __PACKAGE__->add_columns(
   "message_transport_type",
   { data_type => "varchar", is_nullable => 0, size => 20 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</message_transport_type>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("message_transport_type");
 
 =head1 RELATIONS
@@ -101,23 +86,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 borrower_message_preferences
-
-Type: many_to_many
-
-Composing rels: L</borrower_message_transport_preferences> -> borrower_message_preference
-
-=cut
-
-__PACKAGE__->many_to_many(
-  "borrower_message_preferences",
-  "borrower_message_transport_preferences",
-  "borrower_message_preference",
-);
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UApxVVoE1dZpL6HP1kytJQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T3ZjS97UrFDwMZmjYxJg8w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/NeedMergeAuthority.pm b/Koha/Schema/Result/NeedMergeAuthority.pm
index 2b491b7..2db38ef 100644
--- a/Koha/Schema/Result/NeedMergeAuthority.pm
+++ b/Koha/Schema/Result/NeedMergeAuthority.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::NeedMergeAuthority;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::NeedMergeAuthority
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<need_merge_authorities>
+
+=head1 NAME
+
+Koha::Schema::Result::NeedMergeAuthority
 
 =cut
 
@@ -50,22 +46,11 @@ __PACKAGE__->add_columns(
   "done",
   { data_type => "tinyint", default_value => 0, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BL9ArSyPrmUG0QrrWgoPSw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1z93nUqzQgzDUTTt80jzfg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Notify.pm b/Koha/Schema/Result/Notify.pm
index 9be1b2a..e5f27d7 100644
--- a/Koha/Schema/Result/Notify.pm
+++ b/Koha/Schema/Result/Notify.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Notify;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Notify
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<notifys>
+
+=head1 NAME
+
+Koha::Schema::Result::Notify
 
 =cut
 
@@ -44,13 +40,11 @@ __PACKAGE__->table("notifys");
 =head2 notify_date
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 notify_send_date
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 notify_level
@@ -76,9 +70,9 @@ __PACKAGE__->add_columns(
   "itemnumber",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "notify_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "notify_send_date",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "notify_level",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "method",
@@ -86,8 +80,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sQc1HF4rGwsMBh6uFNKUnQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TdyJyIFy6gDH3g04LUERKQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OaiSet.pm b/Koha/Schema/Result/OaiSet.pm
index 32897bf..6cac19d 100644
--- a/Koha/Schema/Result/OaiSet.pm
+++ b/Koha/Schema/Result/OaiSet.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OaiSet;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OaiSet
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<oai_sets>
+
+=head1 NAME
+
+Koha::Schema::Result::OaiSet
 
 =cut
 
@@ -51,31 +47,7 @@ __PACKAGE__->add_columns(
   "name",
   { data_type => "varchar", is_nullable => 0, size => 80 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<spec>
-
-=over 4
-
-=item * L</spec>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("spec", ["spec"]);
 
 =head1 RELATIONS
@@ -125,19 +97,9 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 biblionumbers
-
-Type: many_to_many
-
-Composing rels: L</oai_sets_biblios> -> biblionumber
-
-=cut
-
-__PACKAGE__->many_to_many("biblionumbers", "oai_sets_biblios", "biblionumber");
-
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3M30E7wFbGbesAfQYyalTw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZcQ9f3DGZsVA8zZfe1xHLw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OaiSetsBiblio.pm b/Koha/Schema/Result/OaiSetsBiblio.pm
index 60aaead..5658f7e 100644
--- a/Koha/Schema/Result/OaiSetsBiblio.pm
+++ b/Koha/Schema/Result/OaiSetsBiblio.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OaiSetsBiblio;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OaiSetsBiblio
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<oai_sets_biblios>
+
+=head1 NAME
+
+Koha::Schema::Result::OaiSetsBiblio
 
 =cut
 
@@ -43,19 +39,6 @@ __PACKAGE__->add_columns(
   "set_id",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</biblionumber>
-
-=item * L</set_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("biblionumber", "set_id");
 
 =head1 RELATIONS
@@ -72,7 +55,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 set
@@ -87,12 +70,12 @@ __PACKAGE__->belongs_to(
   "set",
   "Koha::Schema::Result::OaiSet",
   { id => "set_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Zl0mhAt8isigZay80Ie6jA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Eb3cRCkccebsa3FO1igeWA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OaiSetsDescription.pm b/Koha/Schema/Result/OaiSetsDescription.pm
index 6134c02..e5b03a2 100644
--- a/Koha/Schema/Result/OaiSetsDescription.pm
+++ b/Koha/Schema/Result/OaiSetsDescription.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OaiSetsDescription;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OaiSetsDescription
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<oai_sets_descriptions>
+
+=head1 NAME
+
+Koha::Schema::Result::OaiSetsDescription
 
 =cut
 
@@ -58,12 +54,12 @@ __PACKAGE__->belongs_to(
   "set",
   "Koha::Schema::Result::OaiSet",
   { id => "set_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:W8gqXVcVgEpJUdsKQsPn5A
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:S48c9NrOsCuK43gSuzlu7A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OaiSetsMapping.pm b/Koha/Schema/Result/OaiSetsMapping.pm
index e4dd532..cd922c6 100644
--- a/Koha/Schema/Result/OaiSetsMapping.pm
+++ b/Koha/Schema/Result/OaiSetsMapping.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OaiSetsMapping;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OaiSetsMapping
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<oai_sets_mappings>
+
+=head1 NAME
+
+Koha::Schema::Result::OaiSetsMapping
 
 =cut
 
@@ -41,13 +37,6 @@ __PACKAGE__->table("oai_sets_mappings");
   is_nullable: 0
   size: 1
 
-=head2 operator
-
-  data_type: 'varchar'
-  default_value: 'equal'
-  is_nullable: 0
-  size: 8
-
 =head2 marcvalue
 
   data_type: 'varchar'
@@ -63,13 +52,6 @@ __PACKAGE__->add_columns(
   { data_type => "char", is_nullable => 0, size => 3 },
   "marcsubfield",
   { data_type => "char", is_nullable => 0, size => 1 },
-  "operator",
-  {
-    data_type => "varchar",
-    default_value => "equal",
-    is_nullable => 0,
-    size => 8,
-  },
   "marcvalue",
   { data_type => "varchar", is_nullable => 0, size => 80 },
 );
@@ -88,12 +70,12 @@ __PACKAGE__->belongs_to(
   "set",
   "Koha::Schema::Result::OaiSet",
   { id => "set_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:A2fchnI85JftSuruZ1CykQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IBiDgVz+c+dCY/ZHwHEzzQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OldIssue.pm b/Koha/Schema/Result/OldIssue.pm
index 4050f06..3e8769c 100644
--- a/Koha/Schema/Result/OldIssue.pm
+++ b/Koha/Schema/Result/OldIssue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OldIssue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OldIssue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<old_issues>
+
+=head1 NAME
+
+Koha::Schema::Result::OldIssue
 
 =cut
 
@@ -23,6 +19,12 @@ __PACKAGE__->table("old_issues");
 
 =head1 ACCESSORS
 
+=head2 issue_id
+
+  data_type: 'integer'
+  is_auto_increment: 1
+  is_nullable: 0
+
 =head2 borrowernumber
 
   data_type: 'integer'
@@ -38,7 +40,6 @@ __PACKAGE__->table("old_issues");
 =head2 date_due
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branchcode
@@ -56,13 +57,11 @@ __PACKAGE__->table("old_issues");
 =head2 returndate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 lastreneweddate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 return
@@ -79,63 +78,47 @@ __PACKAGE__->table("old_issues");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 issuedate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
 
 __PACKAGE__->add_columns(
+  "issue_id",
+  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "itemnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "date_due",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "branchcode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "issuingbranch",
   { data_type => "varchar", is_nullable => 1, size => 18 },
   "returndate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "lastreneweddate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "return",
   { data_type => "varchar", is_nullable => 1, size => 4 },
   "renewals",
   { data_type => "tinyint", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "issuedate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
+__PACKAGE__->set_primary_key("issue_id");
 
 =head1 RELATIONS
 
@@ -151,12 +134,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 itemnumber
@@ -171,17 +149,12 @@ __PACKAGE__->belongs_to(
   "itemnumber",
   "Koha::Schema::Result::Item",
   { itemnumber => "itemnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:uPOxNROoMMRZ0qZsXsxEjA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:anDKAXiAF/glBH5ihYInOA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OldReserve.pm b/Koha/Schema/Result/OldReserve.pm
index 84ba18c..99eeb61 100644
--- a/Koha/Schema/Result/OldReserve.pm
+++ b/Koha/Schema/Result/OldReserve.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OldReserve;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OldReserve
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<old_reserves>
+
+=head1 NAME
+
+Koha::Schema::Result::OldReserve
 
 =cut
 
@@ -37,7 +33,6 @@ __PACKAGE__->table("old_reserves");
 =head2 reservedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 biblionumber
@@ -61,19 +56,16 @@ __PACKAGE__->table("old_reserves");
 =head2 notificationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 reminderdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 cancellationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 reservenotes
@@ -95,7 +87,6 @@ __PACKAGE__->table("old_reserves");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -108,13 +99,11 @@ __PACKAGE__->table("old_reserves");
 =head2 waitingdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 expirationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 lowestpriority
@@ -131,7 +120,6 @@ __PACKAGE__->table("old_reserves");
 =head2 suspend_until
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -142,7 +130,7 @@ __PACKAGE__->add_columns(
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "reservedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "biblionumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "constrainttype",
@@ -150,11 +138,11 @@ __PACKAGE__->add_columns(
   "branchcode",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "notificationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "reminderdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "cancellationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "reservenotes",
   { data_type => "mediumtext", is_nullable => 1 },
   "priority",
@@ -163,81 +151,55 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "itemnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "waitingdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "expirationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "lowestpriority",
   { data_type => "tinyint", is_nullable => 0 },
   "suspend",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "suspend_until",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</reserve_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("reserve_id");
 
 =head1 RELATIONS
 
-=head2 biblionumber
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Biblio>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "biblionumber",
-  "Koha::Schema::Result::Biblio",
-  { biblionumber => "biblionumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 borrowernumber
+=head2 biblionumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Biblio>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "biblionumber",
+  "Koha::Schema::Result::Biblio",
+  { biblionumber => "biblionumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 itemnumber
@@ -252,17 +214,12 @@ __PACKAGE__->belongs_to(
   "itemnumber",
   "Koha::Schema::Result::Item",
   { itemnumber => "itemnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:g/WiYGPOyzJGtMWiAHvIxA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZLzxJZJINH4TqtWeQUzPYQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/OpacNews.pm b/Koha/Schema/Result/OpacNews.pm
index a3be8e8..8216b16 100644
--- a/Koha/Schema/Result/OpacNews.pm
+++ b/Koha/Schema/Result/OpacNews.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::OpacNews;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::OpacNews
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<opac_news>
+
+=head1 NAME
+
+Koha::Schema::Result::OpacNews
 
 =cut
 
@@ -53,14 +49,12 @@ __PACKAGE__->table("opac_news");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
 =head2 expirationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 number
@@ -86,32 +80,20 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 25 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "expirationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "number",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</idnew>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("idnew");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0tkil0XyRwcT+abM2XoADw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jVbNp0WpNQ5YJCcaJGO6eg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Overduerule.pm b/Koha/Schema/Result/Overduerule.pm
index e985dd8..ae12702 100644
--- a/Koha/Schema/Result/Overduerule.pm
+++ b/Koha/Schema/Result/Overduerule.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Overduerule;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Overduerule
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<overduerules>
+
+=head1 NAME
+
+Koha::Schema::Result::Overduerule
 
 =cut
 
@@ -116,24 +112,11 @@ __PACKAGE__->add_columns(
   "debarred3",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</branchcode>
-
-=item * L</categorycode>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("branchcode", "categorycode");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hP/0cV6iad2dz8kIhCYFjw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:h9dZXd+xmnWePfd3qj2MTw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Patroncard.pm b/Koha/Schema/Result/Patroncard.pm
index 454e958..e3c229f 100644
--- a/Koha/Schema/Result/Patroncard.pm
+++ b/Koha/Schema/Result/Patroncard.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Patroncard;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Patroncard
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<patroncards>
+
+=head1 NAME
+
+Koha::Schema::Result::Patroncard
 
 =cut
 
@@ -45,7 +41,6 @@ __PACKAGE__->table("patroncards");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -60,23 +55,11 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</cardid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("cardid");
 
 =head1 RELATIONS
@@ -93,12 +76,12 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZDpN4iw7+y9YP7Dc+ou8lQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oLjojkGS+XyFLSzkUqdITQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Patronimage.pm b/Koha/Schema/Result/Patronimage.pm
index 8feb4a0..c8ad86e 100644
--- a/Koha/Schema/Result/Patronimage.pm
+++ b/Koha/Schema/Result/Patronimage.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Patronimage;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Patronimage
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<patronimage>
+
+=head1 NAME
+
+Koha::Schema::Result::Patronimage
 
 =cut
 
@@ -26,6 +22,7 @@ __PACKAGE__->table("patronimage");
 =head2 borrowernumber
 
   data_type: 'integer'
+  default_value: 0
   is_foreign_key: 1
   is_nullable: 0
 
@@ -44,23 +41,17 @@ __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",
   { data_type => "mediumblob", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</borrowernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("borrowernumber");
 
 =head1 RELATIONS
@@ -77,12 +68,12 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# 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.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LbVn0LRb/ofXheGTRfMRGg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/PendingOfflineOperation.pm b/Koha/Schema/Result/PendingOfflineOperation.pm
index 969d380..1c4cb15 100644
--- a/Koha/Schema/Result/PendingOfflineOperation.pm
+++ b/Koha/Schema/Result/PendingOfflineOperation.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::PendingOfflineOperation;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::PendingOfflineOperation
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<pending_offline_operations>
+
+=head1 NAME
+
+Koha::Schema::Result::PendingOfflineOperation
 
 =cut
 
@@ -44,7 +40,6 @@ __PACKAGE__->table("pending_offline_operations");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -83,10 +78,9 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 0, size => 10 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "action",
   { data_type => "varchar", is_nullable => 0, size => 10 },
@@ -97,22 +91,11 @@ __PACKAGE__->add_columns(
   "amount",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</operationid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("operationid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hU8G7b8om2DKesFTwuGrJA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UwIrLJGKZxKwreelvSarHw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Permission.pm b/Koha/Schema/Result/Permission.pm
index e2444ee..d620323 100644
--- a/Koha/Schema/Result/Permission.pm
+++ b/Koha/Schema/Result/Permission.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Permission;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Permission
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<permissions>
+
+=head1 NAME
+
+Koha::Schema::Result::Permission
 
 =cut
 
@@ -58,19 +54,6 @@ __PACKAGE__->add_columns(
   "description",
   { data_type => "varchar", is_nullable => 1, size => 255 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</module_bit>
-
-=item * L</code>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("module_bit", "code");
 
 =head1 RELATIONS
@@ -87,7 +70,7 @@ __PACKAGE__->belongs_to(
   "module_bit",
   "Koha::Schema::Result::Userflag",
   { bit => "module_bit" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 user_permissions
@@ -109,8 +92,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ut3lzlxoPPoIIwmhJViV1Q
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nkmnnX0n3zCWQxiIWbn4tQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/PluginData.pm b/Koha/Schema/Result/PluginData.pm
index 869e450..d260b6b 100644
--- a/Koha/Schema/Result/PluginData.pm
+++ b/Koha/Schema/Result/PluginData.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::PluginData;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::PluginData
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<plugin_data>
+
+=head1 NAME
+
+Koha::Schema::Result::PluginData
 
 =cut
 
@@ -50,24 +46,11 @@ __PACKAGE__->add_columns(
   "plugin_value",
   { data_type => "text", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</plugin_class>
-
-=item * L</plugin_key>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("plugin_class", "plugin_key");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/incxJUcobgYLR1a9g8cOQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VCbwjZsVxZCaUm+yvirfXQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Printer.pm b/Koha/Schema/Result/Printer.pm
index 7386f2a..c524cdc 100644
--- a/Koha/Schema/Result/Printer.pm
+++ b/Koha/Schema/Result/Printer.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Printer;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Printer
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<printers>
+
+=head1 NAME
+
+Koha::Schema::Result::Printer
 
 =cut
 
@@ -52,22 +48,11 @@ __PACKAGE__->add_columns(
   "printtype",
   { data_type => "varchar", is_nullable => 1, size => 20 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</printername>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("printername");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OaIxwtdwn0TJLggwOygC2w
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ehTuxbZGNE/ZttzJgyNgVw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/PrintersProfile.pm b/Koha/Schema/Result/PrintersProfile.pm
index b02f027..d3954ce 100644
--- a/Koha/Schema/Result/PrintersProfile.pm
+++ b/Koha/Schema/Result/PrintersProfile.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::PrintersProfile;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::PrintersProfile
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<printers_profile>
+
+=head1 NAME
+
+Koha::Schema::Result::PrintersProfile
 
 =cut
 
@@ -126,45 +122,15 @@ __PACKAGE__->add_columns(
     size => 15,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</profile_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("profile_id");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<printername>
-
-=over 4
-
-=item * L</printer_name>
-
-=item * L</template_id>
-
-=item * L</paper_bin>
-
-=item * L</creator>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint(
   "printername",
   ["printer_name", "template_id", "paper_bin", "creator"],
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GJid4zfVF0MmMnUn3xyVbA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:F4Whmdn3t/w+GiaBIM2m+A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Quote.pm b/Koha/Schema/Result/Quote.pm
index 2f34bb2..c7e9271 100644
--- a/Koha/Schema/Result/Quote.pm
+++ b/Koha/Schema/Result/Quote.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Quote;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Quote
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<quotes>
+
+=head1 NAME
+
+Koha::Schema::Result::Quote
 
 =cut
 
@@ -42,7 +38,6 @@ __PACKAGE__->table("quotes");
 =head2 timestamp
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =cut
@@ -55,28 +50,13 @@ __PACKAGE__->add_columns(
   "text",
   { data_type => "mediumtext", is_nullable => 0 },
   "timestamp",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 0,
-  },
+  { data_type => "datetime", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WhRbBrQ4jMV+pjgKnOhErg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8sO9ufLJlFIhguJEVC3I8A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Rating.pm b/Koha/Schema/Result/Rating.pm
index a8fe6e4..dab00d1 100644
--- a/Koha/Schema/Result/Rating.pm
+++ b/Koha/Schema/Result/Rating.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Rating;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Rating
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<ratings>
+
+=head1 NAME
+
+Koha::Schema::Result::Rating
 
 =cut
 
@@ -43,7 +39,6 @@ __PACKAGE__->table("ratings");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -58,62 +53,48 @@ __PACKAGE__->add_columns(
   { data_type => "tinyint", is_nullable => 0 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</borrowernumber>
-
-=item * L</biblionumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("borrowernumber", "biblionumber");
 
 =head1 RELATIONS
 
-=head2 biblionumber
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Biblio>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "biblionumber",
-  "Koha::Schema::Result::Biblio",
-  { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 borrowernumber
+=head2 biblionumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Biblio>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "biblionumber",
+  "Koha::Schema::Result::Biblio",
+  { biblionumber => "biblionumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YT3jPQbA2TBuOuUXfEt7gQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eJAHcfCMllgMZZe5rwtcoA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/RepeatableHoliday.pm b/Koha/Schema/Result/RepeatableHoliday.pm
index 4451513..f7b7a96 100644
--- a/Koha/Schema/Result/RepeatableHoliday.pm
+++ b/Koha/Schema/Result/RepeatableHoliday.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::RepeatableHoliday;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::RepeatableHoliday
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<repeatable_holidays>
+
+=head1 NAME
+
+Koha::Schema::Result::RepeatableHoliday
 
 =cut
 
@@ -81,22 +77,11 @@ __PACKAGE__->add_columns(
   "description",
   { data_type => "text", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:15Ot3jdlgFpmCbVgUDqZRg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fbMefsPCXNlvvTF5AqsUxw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ReportsDictionary.pm b/Koha/Schema/Result/ReportsDictionary.pm
index de433a5..5daa1ae 100644
--- a/Koha/Schema/Result/ReportsDictionary.pm
+++ b/Koha/Schema/Result/ReportsDictionary.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ReportsDictionary;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ReportsDictionary
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<reports_dictionary>
+
+=head1 NAME
+
+Koha::Schema::Result::ReportsDictionary
 
 =cut
 
@@ -43,13 +39,11 @@ __PACKAGE__->table("reports_dictionary");
 =head2 date_created
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 date_modified
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 saved_sql
@@ -73,38 +67,19 @@ __PACKAGE__->add_columns(
   "description",
   { data_type => "text", is_nullable => 1 },
   "date_created",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "date_modified",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "saved_sql",
   { data_type => "text", is_nullable => 1 },
   "report_area",
   { data_type => "varchar", is_nullable => 1, size => 6 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Cnru3/NTfEScxeVggDa5RA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EAWLegQRr3CdesQVg7i0FQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Reserve.pm b/Koha/Schema/Result/Reserve.pm
index 527651d..6eff719 100644
--- a/Koha/Schema/Result/Reserve.pm
+++ b/Koha/Schema/Result/Reserve.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Reserve;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Reserve
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<reserves>
+
+=head1 NAME
+
+Koha::Schema::Result::Reserve
 
 =cut
 
@@ -39,7 +35,6 @@ __PACKAGE__->table("reserves");
 =head2 reservedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 biblionumber
@@ -65,19 +60,16 @@ __PACKAGE__->table("reserves");
 =head2 notificationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 reminderdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 cancellationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 reservenotes
@@ -99,7 +91,6 @@ __PACKAGE__->table("reserves");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -112,13 +103,11 @@ __PACKAGE__->table("reserves");
 =head2 waitingdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 expirationdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 lowestpriority
@@ -135,7 +124,6 @@ __PACKAGE__->table("reserves");
 =head2 suspend_until
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -151,7 +139,7 @@ __PACKAGE__->add_columns(
     is_nullable    => 0,
   },
   "reservedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "biblionumber",
   {
     data_type      => "integer",
@@ -164,11 +152,11 @@ __PACKAGE__->add_columns(
   "branchcode",
   { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 },
   "notificationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "reminderdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "cancellationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "reservenotes",
   { data_type => "mediumtext", is_nullable => 1 },
   "priority",
@@ -177,42 +165,41 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "itemnumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "waitingdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "expirationdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "lowestpriority",
   { data_type => "tinyint", is_nullable => 0 },
   "suspend",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "suspend_until",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
+__PACKAGE__->set_primary_key("reserve_id");
 
-=head1 PRIMARY KEY
+=head1 RELATIONS
 
-=over 4
+=head2 borrowernumber
 
-=item * L</reserve_id>
+Type: belongs_to
 
-=back
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
-__PACKAGE__->set_primary_key("reserve_id");
-
-=head1 RELATIONS
+__PACKAGE__->belongs_to(
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
+);
 
 =head2 biblionumber
 
@@ -226,22 +213,22 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 borrowernumber
+=head2 itemnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Item>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "itemnumber",
+  "Koha::Schema::Result::Item",
+  { itemnumber => "itemnumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 branchcode
@@ -256,37 +243,12 @@ __PACKAGE__->belongs_to(
   "branchcode",
   "Koha::Schema::Result::Branch",
   { branchcode => "branchcode" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
-=head2 itemnumber
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Item>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "itemnumber",
-  "Koha::Schema::Result::Item",
-  { itemnumber => "itemnumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ig/fobzvZf1OgAHZFtkyyQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Tmf4GhDljsiUSc3zXpFpvw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Reserveconstraint.pm b/Koha/Schema/Result/Reserveconstraint.pm
index 69d7a2b..33b2336 100644
--- a/Koha/Schema/Result/Reserveconstraint.pm
+++ b/Koha/Schema/Result/Reserveconstraint.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Reserveconstraint;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Reserveconstraint
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<reserveconstraints>
+
+=head1 NAME
+
+Koha::Schema::Result::Reserveconstraint
 
 =cut
 
@@ -32,7 +28,6 @@ __PACKAGE__->table("reserveconstraints");
 =head2 reservedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 biblionumber
@@ -49,7 +44,6 @@ __PACKAGE__->table("reserveconstraints");
 =head2 timestamp
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -59,23 +53,22 @@ __PACKAGE__->add_columns(
   "borrowernumber",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "reservedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "biblionumber",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "biblioitemnumber",
   { data_type => "integer", is_nullable => 1 },
   "timestamp",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qsSPIwQxTBxw3s2a3hD34g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SD7Qb11SrWlC8IEKeGpVlg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Review.pm b/Koha/Schema/Result/Review.pm
index 37b822d..e9621b4 100644
--- a/Koha/Schema/Result/Review.pm
+++ b/Koha/Schema/Result/Review.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Review;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Review
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<reviews>
+
+=head1 NAME
+
+Koha::Schema::Result::Review
 
 =cut
 
@@ -54,7 +50,6 @@ __PACKAGE__->table("reviews");
 =head2 datereviewed
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -71,70 +66,45 @@ __PACKAGE__->add_columns(
   "approved",
   { data_type => "tinyint", is_nullable => 1 },
   "datereviewed",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</reviewid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("reviewid");
 
 =head1 RELATIONS
 
-=head2 biblionumber
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Biblio>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "biblionumber",
-  "Koha::Schema::Result::Biblio",
-  { biblionumber => "biblionumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 borrowernumber
+=head2 biblionumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Biblio>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "biblionumber",
+  "Koha::Schema::Result::Biblio",
+  { biblionumber => "biblionumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/gg7wEkOzJ7yI3UXoDcQKA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sZgijj68waHkEcbRAMMjZg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Roadtype.pm b/Koha/Schema/Result/Roadtype.pm
index f4b20f8..24aa4cc 100644
--- a/Koha/Schema/Result/Roadtype.pm
+++ b/Koha/Schema/Result/Roadtype.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Roadtype;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Roadtype
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<roadtype>
+
+=head1 NAME
+
+Koha::Schema::Result::Roadtype
 
 =cut
 
@@ -44,22 +40,11 @@ __PACKAGE__->add_columns(
   "road_type",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</roadtypeid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("roadtypeid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5kGeIy5frUgC5wj646dC3g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QyJNTAGHlSf1UFtS8O01Yg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/SavedReport.pm b/Koha/Schema/Result/SavedReport.pm
index a5d8ca4..834581a 100644
--- a/Koha/Schema/Result/SavedReport.pm
+++ b/Koha/Schema/Result/SavedReport.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::SavedReport;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::SavedReport
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<saved_reports>
+
+=head1 NAME
+
+Koha::Schema::Result::SavedReport
 
 =cut
 
@@ -42,7 +38,6 @@ __PACKAGE__->table("saved_reports");
 =head2 date_run
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -55,28 +50,13 @@ __PACKAGE__->add_columns(
   "report",
   { data_type => "longtext", is_nullable => 1 },
   "date_run",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wvI6/eIxRIm+WWeDVepQaw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JwyjkZ8N6j96guzbzKLPvA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/SavedSql.pm b/Koha/Schema/Result/SavedSql.pm
index d878034..26ab118 100644
--- a/Koha/Schema/Result/SavedSql.pm
+++ b/Koha/Schema/Result/SavedSql.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::SavedSql;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::SavedSql
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<saved_sql>
+
+=head1 NAME
+
+Koha::Schema::Result::SavedSql
 
 =cut
 
@@ -37,13 +33,11 @@ __PACKAGE__->table("saved_sql");
 =head2 date_created
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 last_modified
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 savedsql
@@ -54,7 +48,6 @@ __PACKAGE__->table("saved_sql");
 =head2 last_run
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 report_name
@@ -112,25 +105,13 @@ __PACKAGE__->add_columns(
   "borrowernumber",
   { data_type => "integer", is_nullable => 1 },
   "date_created",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "last_modified",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "savedsql",
   { data_type => "text", is_nullable => 1 },
   "last_run",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "report_name",
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "type",
@@ -148,22 +129,11 @@ __PACKAGE__->add_columns(
   "report_subgroup",
   { data_type => "varchar", is_nullable => 1, size => 80 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:laD/JwzxzYnUhBABofprEA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7n40GyxVGF1yCi7gnazmtQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/SearchHistory.pm b/Koha/Schema/Result/SearchHistory.pm
index 224d9f0..cba725a 100644
--- a/Koha/Schema/Result/SearchHistory.pm
+++ b/Koha/Schema/Result/SearchHistory.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::SearchHistory;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::SearchHistory - Opac search history results
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<search_history>
+
+=head1 NAME
+
+Koha::Schema::Result::SearchHistory
 
 =cut
 
@@ -53,7 +49,6 @@ __PACKAGE__->table("search_history");
 =head2 time
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -72,16 +67,15 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 0 },
   "time",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HLDQ0HfcjBkl6y1rXoX0qA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xDbE0+JiOdrvFzYh8wTISw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Serial.pm b/Koha/Schema/Result/Serial.pm
index c3f711e..bb01ca5 100644
--- a/Koha/Schema/Result/Serial.pm
+++ b/Koha/Schema/Result/Serial.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Serial;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Serial
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<serial>
+
+=head1 NAME
+
+Koha::Schema::Result::Serial
 
 =cut
 
@@ -59,7 +55,6 @@ __PACKAGE__->table("serial");
 =head2 planneddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 notes
@@ -70,13 +65,11 @@ __PACKAGE__->table("serial");
 =head2 publisheddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 claimdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 routingnotes
@@ -98,27 +91,16 @@ __PACKAGE__->add_columns(
   "status",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "planneddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "notes",
   { data_type => "text", is_nullable => 1 },
   "publisheddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "claimdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "routingnotes",
   { data_type => "text", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</serialid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("serialid");
 
 =head1 RELATIONS
@@ -139,8 +121,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xloe1BJrVD7sU07AnA4P2g
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:be0qdPp8DJMFH9pWZ3IVEg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Serialitem.pm b/Koha/Schema/Result/Serialitem.pm
index 6f805d3..2be5e4f 100644
--- a/Koha/Schema/Result/Serialitem.pm
+++ b/Koha/Schema/Result/Serialitem.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Serialitem;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Serialitem
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<serialitems>
+
+=head1 NAME
+
+Koha::Schema::Result::Serialitem
 
 =cut
 
@@ -43,56 +39,43 @@ __PACKAGE__->add_columns(
   "serialid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<serialitemsidx>
-
-=over 4
-
-=item * L</itemnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("serialitemsidx", ["itemnumber"]);
 
 =head1 RELATIONS
 
-=head2 itemnumber
+=head2 serialid
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Item>
+Related object: L<Koha::Schema::Result::Serial>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "itemnumber",
-  "Koha::Schema::Result::Item",
-  { itemnumber => "itemnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "serialid",
+  "Koha::Schema::Result::Serial",
+  { serialid => "serialid" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 serialid
+=head2 itemnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Serial>
+Related object: L<Koha::Schema::Result::Item>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "serialid",
-  "Koha::Schema::Result::Serial",
-  { serialid => "serialid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "itemnumber",
+  "Koha::Schema::Result::Item",
+  { itemnumber => "itemnumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JZcKy2QIB2c39vgpntWahQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:x/F5S9ilc144kjlRHRAjPA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/ServicesThrottle.pm b/Koha/Schema/Result/ServicesThrottle.pm
index d9e34e4..c5a8fc4 100644
--- a/Koha/Schema/Result/ServicesThrottle.pm
+++ b/Koha/Schema/Result/ServicesThrottle.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::ServicesThrottle;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::ServicesThrottle
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<services_throttle>
+
+=head1 NAME
+
+Koha::Schema::Result::ServicesThrottle
 
 =cut
 
@@ -44,22 +40,11 @@ __PACKAGE__->add_columns(
   "service_count",
   { data_type => "varchar", is_nullable => 1, size => 45 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</service_type>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("service_type");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XxtEV+cJ5qa/3oCHd2GrSw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:b9GW1Asa0nQUwYoUZ1Zg/g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Session.pm b/Koha/Schema/Result/Session.pm
index bbbe5a6..a09d898 100644
--- a/Koha/Schema/Result/Session.pm
+++ b/Koha/Schema/Result/Session.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Session;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Session
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<sessions>
+
+=head1 NAME
+
+Koha::Schema::Result::Session
 
 =cut
 
@@ -42,22 +38,11 @@ __PACKAGE__->add_columns(
   "a_session",
   { data_type => "text", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:N/DKx6NVPCcbDVK3SSMfGQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:1Q7RHnXwJDLmDSYDGgx9Ig
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/SocialData.pm b/Koha/Schema/Result/SocialData.pm
index b21e508..70f6a39 100644
--- a/Koha/Schema/Result/SocialData.pm
+++ b/Koha/Schema/Result/SocialData.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::SocialData;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::SocialData
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<social_data>
+
+=head1 NAME
+
+Koha::Schema::Result::SocialData
 
 =cut
 
@@ -79,22 +75,11 @@ __PACKAGE__->add_columns(
   "num_scores",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</isbn>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("isbn");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Medc/ZzPVp5Eq+adFoqQoA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WOoTJtUwFv9mQyU/V8CfCg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/SpecialHoliday.pm b/Koha/Schema/Result/SpecialHoliday.pm
index 45f884f..9fc80f9 100644
--- a/Koha/Schema/Result/SpecialHoliday.pm
+++ b/Koha/Schema/Result/SpecialHoliday.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::SpecialHoliday;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::SpecialHoliday
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<special_holidays>
+
+=head1 NAME
+
+Koha::Schema::Result::SpecialHoliday
 
 =cut
 
@@ -92,22 +88,11 @@ __PACKAGE__->add_columns(
   "description",
   { data_type => "text", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mRo3D1nPRJsMY6hPxp/Ojg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:g7qNXuX47xhJ07sL90PDVw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Statistic.pm b/Koha/Schema/Result/Statistic.pm
index d6fd976..6b1ea3f 100644
--- a/Koha/Schema/Result/Statistic.pm
+++ b/Koha/Schema/Result/Statistic.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Statistic;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Statistic
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<statistics>
+
+=head1 NAME
+
+Koha::Schema::Result::Statistic
 
 =cut
 
@@ -26,7 +22,6 @@ __PACKAGE__->table("statistics");
 =head2 datetime
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 branch
@@ -95,11 +90,7 @@ __PACKAGE__->table("statistics");
 
 __PACKAGE__->add_columns(
   "datetime",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "branch",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "proccode",
@@ -125,8 +116,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:THELVmdFFi1RCI4DfqwGIw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9tyagrI46Be8UBXHxN+S+Q
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Stopword.pm b/Koha/Schema/Result/Stopword.pm
index 2fd88b6..85947c1 100644
--- a/Koha/Schema/Result/Stopword.pm
+++ b/Koha/Schema/Result/Stopword.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Stopword;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Stopword
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<stopwords>
+
+=head1 NAME
+
+Koha::Schema::Result::Stopword
 
 =cut
 
@@ -37,8 +33,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8cIdWFpf7DlA61On1F7cVg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:U1F4NG9asxioA74VtWth5w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Subscription.pm b/Koha/Schema/Result/Subscription.pm
index 91e408c..1400f01 100644
--- a/Koha/Schema/Result/Subscription.pm
+++ b/Koha/Schema/Result/Subscription.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Subscription;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Subscription
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<subscription>
+
+=head1 NAME
+
+Koha::Schema::Result::Subscription
 
 =cut
 
@@ -45,7 +41,6 @@ __PACKAGE__->table("subscription");
 =head2 startdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 aqbooksellerid
@@ -86,15 +81,23 @@ __PACKAGE__->table("subscription");
 
 =head2 periodicity
 
-  data_type: 'integer'
-  is_foreign_key: 1
+  data_type: 'tinyint'
+  default_value: 0
   is_nullable: 1
 
-=head2 countissuesperunit
+=head2 dow
 
-  data_type: 'integer'
-  default_value: 1
-  is_nullable: 0
+  data_type: 'varchar'
+  default_value: (empty string)
+  is_nullable: 1
+  size: 100
+
+=head2 numberingmethod
+
+  data_type: 'varchar'
+  default_value: (empty string)
+  is_nullable: 1
+  size: 100
 
 =head2 notes
 
@@ -108,31 +111,84 @@ __PACKAGE__->table("subscription");
   is_nullable: 0
   size: 100
 
+=head2 add1
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 every1
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 whenmorethan1
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 setto1
+
+  data_type: 'integer'
+  is_nullable: 1
+
 =head2 lastvalue1
 
   data_type: 'integer'
   is_nullable: 1
 
-=head2 innerloop1
+=head2 add2
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 every2
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 whenmorethan2
 
   data_type: 'integer'
   default_value: 0
   is_nullable: 1
 
+=head2 setto2
+
+  data_type: 'integer'
+  is_nullable: 1
+
 =head2 lastvalue2
 
   data_type: 'integer'
   is_nullable: 1
 
-=head2 innerloop2
+=head2 add3
 
   data_type: 'integer'
   default_value: 0
   is_nullable: 1
 
-=head2 lastvalue3
+=head2 every3
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 innerloop1
 
   data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 innerloop2
+
+  data_type: 'integer'
+  default_value: 0
   is_nullable: 1
 
 =head2 innerloop3
@@ -141,10 +197,31 @@ __PACKAGE__->table("subscription");
   default_value: 0
   is_nullable: 1
 
+=head2 whenmorethan3
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
+=head2 setto3
+
+  data_type: 'integer'
+  is_nullable: 1
+
+=head2 lastvalue3
+
+  data_type: 'integer'
+  is_nullable: 1
+
+=head2 issuesatonce
+
+  data_type: 'tinyint'
+  default_value: 1
+  is_nullable: 0
+
 =head2 firstacquidate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 manualhistory
@@ -158,12 +235,6 @@ __PACKAGE__->table("subscription");
   data_type: 'text'
   is_nullable: 1
 
-=head2 skip_serialseq
-
-  data_type: 'tinyint'
-  default_value: 0
-  is_nullable: 0
-
 =head2 letter
 
   data_type: 'varchar'
@@ -172,15 +243,9 @@ __PACKAGE__->table("subscription");
 
 =head2 numberpattern
 
-  data_type: 'integer'
-  is_foreign_key: 1
-  is_nullable: 1
-
-=head2 locale
-
-  data_type: 'varchar'
+  data_type: 'tinyint'
+  default_value: 0
   is_nullable: 1
-  size: 80
 
 =head2 distributedto
 
@@ -211,6 +276,12 @@ __PACKAGE__->table("subscription");
   is_nullable: 0
   size: 10
 
+=head2 hemisphere
+
+  data_type: 'tinyint'
+  default_value: 0
+  is_nullable: 1
+
 =head2 lastbranch
 
   data_type: 'varchar'
@@ -244,7 +315,6 @@ __PACKAGE__->table("subscription");
 =head2 enddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 closed
@@ -256,7 +326,6 @@ __PACKAGE__->table("subscription");
 =head2 reneweddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -269,7 +338,7 @@ __PACKAGE__->add_columns(
   "librarian",
   { data_type => "varchar", default_value => "", is_nullable => 1, size => 100 },
   "startdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "aqbooksellerid",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
   "cost",
@@ -283,39 +352,63 @@ __PACKAGE__->add_columns(
   "numberlength",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
   "periodicity",
-  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
-  "countissuesperunit",
-  { data_type => "integer", default_value => 1, is_nullable => 0 },
+  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
+  "dow",
+  { data_type => "varchar", default_value => "", is_nullable => 1, size => 100 },
+  "numberingmethod",
+  { data_type => "varchar", default_value => "", is_nullable => 1, size => 100 },
   "notes",
   { data_type => "mediumtext", is_nullable => 1 },
   "status",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 },
+  "add1",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "every1",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "whenmorethan1",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "setto1",
+  { data_type => "integer", is_nullable => 1 },
   "lastvalue1",
   { data_type => "integer", is_nullable => 1 },
-  "innerloop1",
+  "add2",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "every2",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "whenmorethan2",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "setto2",
+  { data_type => "integer", is_nullable => 1 },
   "lastvalue2",
   { data_type => "integer", is_nullable => 1 },
+  "add3",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "every3",
+  { data_type => "integer", default_value => 0, 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 },
+  "whenmorethan3",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
+  "setto3",
+  { data_type => "integer", is_nullable => 1 },
+  "lastvalue3",
+  { data_type => "integer", is_nullable => 1 },
+  "issuesatonce",
+  { data_type => "tinyint", default_value => 1, is_nullable => 0 },
   "firstacquidate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "manualhistory",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "irregularity",
   { data_type => "text", is_nullable => 1 },
-  "skip_serialseq",
-  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
   "letter",
   { data_type => "varchar", is_nullable => 1, size => 20 },
   "numberpattern",
-  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
-  "locale",
-  { data_type => "varchar", is_nullable => 1, size => 80 },
+  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
   "distributedto",
   { data_type => "text", is_nullable => 1 },
   "internalnotes",
@@ -326,6 +419,8 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", default_value => "", is_nullable => 1, size => 80 },
   "branchcode",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
+  "hemisphere",
+  { data_type => "tinyint", default_value => 0, is_nullable => 1 },
   "lastbranch",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "serialsadditems",
@@ -337,23 +432,12 @@ __PACKAGE__->add_columns(
   "graceperiod",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "enddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "closed",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "reneweddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</subscriptionid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("subscriptionid");
 
 =head1 RELATIONS
@@ -373,46 +457,6 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
-=head2 numberpattern
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::SubscriptionNumberpattern>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "numberpattern",
-  "Koha::Schema::Result::SubscriptionNumberpattern",
-  { id => "numberpattern" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
-=head2 periodicity
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::SubscriptionFrequency>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "periodicity",
-  "Koha::Schema::Result::SubscriptionFrequency",
-  { id => "periodicity" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
 =head2 subscriptionroutinglists
 
 Type: has_many
@@ -429,8 +473,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-30 02:42:01
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JoTdms86n/xfPo8YUnDHUQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2vGQeK1QqRxFYpYz+fafWg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Subscriptionhistory.pm b/Koha/Schema/Result/Subscriptionhistory.pm
index b15044a..b6dfb07 100644
--- a/Koha/Schema/Result/Subscriptionhistory.pm
+++ b/Koha/Schema/Result/Subscriptionhistory.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Subscriptionhistory;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Subscriptionhistory
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<subscriptionhistory>
+
+=head1 NAME
+
+Koha::Schema::Result::Subscriptionhistory
 
 =cut
 
@@ -38,13 +34,11 @@ __PACKAGE__->table("subscriptionhistory");
 =head2 histstartdate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 histenddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 missinglist
@@ -79,9 +73,9 @@ __PACKAGE__->add_columns(
   "subscriptionid",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "histstartdate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "histenddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "missinglist",
   { data_type => "longtext", is_nullable => 0 },
   "recievedlist",
@@ -91,22 +85,11 @@ __PACKAGE__->add_columns(
   "librariannote",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 150 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</subscriptionid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("subscriptionid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+cXluRE1oKiCGOgwq1bhJw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:g1qcc1arD+FR8xT6ONu4Zw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Subscriptionroutinglist.pm b/Koha/Schema/Result/Subscriptionroutinglist.pm
index 7741142..67f2b57 100644
--- a/Koha/Schema/Result/Subscriptionroutinglist.pm
+++ b/Koha/Schema/Result/Subscriptionroutinglist.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Subscriptionroutinglist;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Subscriptionroutinglist
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<subscriptionroutinglist>
+
+=head1 NAME
+
+Koha::Schema::Result::Subscriptionroutinglist
 
 =cut
 
@@ -58,33 +54,7 @@ __PACKAGE__->add_columns(
   "subscriptionid",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</routingid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("routingid");
-
-=head1 UNIQUE CONSTRAINTS
-
-=head2 C<subscriptionid>
-
-=over 4
-
-=item * L</subscriptionid>
-
-=item * L</borrowernumber>
-
-=back
-
-=cut
-
 __PACKAGE__->add_unique_constraint("subscriptionid", ["subscriptionid", "borrowernumber"]);
 
 =head1 RELATIONS
@@ -101,7 +71,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 subscriptionid
@@ -116,12 +86,12 @@ __PACKAGE__->belongs_to(
   "subscriptionid",
   "Koha::Schema::Result::Subscription",
   { subscriptionid => "subscriptionid" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AK595c56vgTa7ZjwZjberw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UexNHjOzf3uGXPx9kjbaLw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Suggestion.pm b/Koha/Schema/Result/Suggestion.pm
index 5e394fc..045d45d 100644
--- a/Koha/Schema/Result/Suggestion.pm
+++ b/Koha/Schema/Result/Suggestion.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Suggestion;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Suggestion
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<suggestions>
+
+=head1 NAME
+
+Koha::Schema::Result::Suggestion
 
 =cut
 
@@ -38,7 +34,6 @@ __PACKAGE__->table("suggestions");
 =head2 suggesteddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   default_value: '0000-00-00'
   is_nullable: 0
 
@@ -50,7 +45,6 @@ __PACKAGE__->table("suggestions");
 =head2 manageddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 acceptedby
@@ -61,7 +55,6 @@ __PACKAGE__->table("suggestions");
 =head2 accepteddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 rejectedby
@@ -72,7 +65,6 @@ __PACKAGE__->table("suggestions");
 =head2 rejecteddate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 status
@@ -113,7 +105,6 @@ __PACKAGE__->table("suggestions");
 =head2 date
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -215,24 +206,19 @@ __PACKAGE__->add_columns(
   "suggestedby",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "suggesteddate",
-  {
-    data_type => "date",
-    datetime_undef_if_invalid => 1,
-    default_value => "0000-00-00",
-    is_nullable => 0,
-  },
+  { data_type => "date", default_value => "0000-00-00", is_nullable => 0 },
   "managedby",
   { data_type => "integer", is_nullable => 1 },
   "manageddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "acceptedby",
   { data_type => "integer", is_nullable => 1 },
   "accepteddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "rejectedby",
   { data_type => "integer", is_nullable => 1 },
   "rejecteddate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "status",
   { data_type => "varchar", default_value => "", is_nullable => 0, size => 10 },
   "note",
@@ -247,10 +233,9 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 255 },
   "date",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "volumedesc",
   { data_type => "varchar", is_nullable => 1, size => 255 },
@@ -285,22 +270,11 @@ __PACKAGE__->add_columns(
   "total",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</suggestionid>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("suggestionid");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CQRbWbu5MBouyD67ArSRNw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Leu2DWPuf1q/de+LG1cETw
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Systempreference.pm b/Koha/Schema/Result/Systempreference.pm
index ef05bd8..04690d4 100644
--- a/Koha/Schema/Result/Systempreference.pm
+++ b/Koha/Schema/Result/Systempreference.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Systempreference;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Systempreference
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<systempreferences>
+
+=head1 NAME
+
+Koha::Schema::Result::Systempreference
 
 =cut
 
@@ -65,22 +61,11 @@ __PACKAGE__->add_columns(
   "type",
   { data_type => "varchar", is_nullable => 1, size => 20 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</variable>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("variable");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WalVf/kVVNRcfYely910iQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:P5qSdblVBL74KQateiAwig
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Tag.pm b/Koha/Schema/Result/Tag.pm
index 321d2e9..d658082 100644
--- a/Koha/Schema/Result/Tag.pm
+++ b/Koha/Schema/Result/Tag.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Tag;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Tag
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<tags>
+
+=head1 NAME
+
+Koha::Schema::Result::Tag
 
 =cut
 
@@ -44,22 +40,11 @@ __PACKAGE__->add_columns(
   "weight",
   { data_type => "bigint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</entry>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("entry");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oXXMdTe9zYBblKs7SE8uPg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rDVBEJyucrq1JT1w24Lyhg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/TagAll.pm b/Koha/Schema/Result/TagAll.pm
index ca1a470..88256fb 100644
--- a/Koha/Schema/Result/TagAll.pm
+++ b/Koha/Schema/Result/TagAll.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::TagAll;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::TagAll
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<tags_all>
+
+=head1 NAME
+
+Koha::Schema::Result::TagAll
 
 =cut
 
@@ -55,7 +51,6 @@ __PACKAGE__->table("tags_all");
 =head2 date_created
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 0
 
 =cut
@@ -72,23 +67,8 @@ __PACKAGE__->add_columns(
   "language",
   { data_type => "integer", is_nullable => 1 },
   "date_created",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 0,
-  },
+  { data_type => "datetime", is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</tag_id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("tag_id");
 
 =head1 RELATIONS
@@ -105,7 +85,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 borrowernumber
@@ -120,12 +100,12 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xhJn9d2lS8crFWog28ENnw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zgwGwma+2qTnQUqkTAjsrg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/TagsApproval.pm b/Koha/Schema/Result/TagsApproval.pm
index 50abeb2..3f84e91 100644
--- a/Koha/Schema/Result/TagsApproval.pm
+++ b/Koha/Schema/Result/TagsApproval.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::TagsApproval;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::TagsApproval
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<tags_approval>
+
+=head1 NAME
+
+Koha::Schema::Result::TagsApproval
 
 =cut
 
@@ -38,7 +34,6 @@ __PACKAGE__->table("tags_approval");
 =head2 date_approved
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 approved_by
@@ -61,27 +56,12 @@ __PACKAGE__->add_columns(
   "approved",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "date_approved",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
   "approved_by",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
   "weight_total",
   { data_type => "integer", default_value => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</term>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("term");
 
 =head1 RELATIONS
@@ -98,12 +78,7 @@ __PACKAGE__->belongs_to(
   "approved_by",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "approved_by" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 tags_indexes
@@ -122,8 +97,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TcnMQQTB5F8hjyLoJ7VBHQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KIlrjfAmSo+kMon1Ctef+A
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/TagsIndex.pm b/Koha/Schema/Result/TagsIndex.pm
index 49d2c1b..d8d6886 100644
--- a/Koha/Schema/Result/TagsIndex.pm
+++ b/Koha/Schema/Result/TagsIndex.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::TagsIndex;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::TagsIndex
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<tags_index>
+
+=head1 NAME
+
+Koha::Schema::Result::TagsIndex
 
 =cut
 
@@ -52,19 +48,6 @@ __PACKAGE__->add_columns(
   "weight",
   { data_type => "integer", default_value => 1, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</term>
-
-=item * L</biblionumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("term", "biblionumber");
 
 =head1 RELATIONS
@@ -81,7 +64,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 term
@@ -96,12 +79,12 @@ __PACKAGE__->belongs_to(
   "term",
   "Koha::Schema::Result::TagsApproval",
   { term => "term" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LCvvyig+memFWmWUdCStXQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5GLcsD5NDmjMq1Pb5RvNqA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/TmpHoldsqueue.pm b/Koha/Schema/Result/TmpHoldsqueue.pm
index 9f2a8e4..f4ea9cf 100644
--- a/Koha/Schema/Result/TmpHoldsqueue.pm
+++ b/Koha/Schema/Result/TmpHoldsqueue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::TmpHoldsqueue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::TmpHoldsqueue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<tmp_holdsqueue>
+
+=head1 NAME
+
+Koha::Schema::Result::TmpHoldsqueue
 
 =cut
 
@@ -68,7 +64,6 @@ __PACKAGE__->table("tmp_holdsqueue");
 =head2 reservedate
 
   data_type: 'date'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =head2 title
@@ -125,7 +120,7 @@ __PACKAGE__->add_columns(
   "cardnumber",
   { data_type => "varchar", is_nullable => 1, size => 16 },
   "reservedate",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
+  { data_type => "date", is_nullable => 1 },
   "title",
   { data_type => "mediumtext", is_nullable => 1 },
   "itemcallnumber",
@@ -141,8 +136,8 @@ __PACKAGE__->add_columns(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZD6xOAdXuMjglFtNa+DMEQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:HUO09eSkxI4L6taIU3j59w
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/TransportCost.pm b/Koha/Schema/Result/TransportCost.pm
index 9defb97..9ba245b 100644
--- a/Koha/Schema/Result/TransportCost.pm
+++ b/Koha/Schema/Result/TransportCost.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::TransportCost;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::TransportCost
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<transport_cost>
+
+=head1 NAME
+
+Koha::Schema::Result::TransportCost
 
 =cut
 
@@ -61,19 +57,6 @@ __PACKAGE__->add_columns(
   "disable_transfer",
   { data_type => "tinyint", default_value => 0, is_nullable => 0 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</frombranch>
-
-=item * L</tobranch>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("frombranch", "tobranch");
 
 =head1 RELATIONS
@@ -90,7 +73,7 @@ __PACKAGE__->belongs_to(
   "frombranch",
   "Koha::Schema::Result::Branch",
   { branchcode => "frombranch" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 tobranch
@@ -105,12 +88,12 @@ __PACKAGE__->belongs_to(
   "tobranch",
   "Koha::Schema::Result::Branch",
   { branchcode => "tobranch" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:gMs7dT/xK4ClGqQEHI7HOQ
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xNdkqIMuiG/cMRz0QD8IKA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/UserPermission.pm b/Koha/Schema/Result/UserPermission.pm
index 948c2e1..58a9b91 100644
--- a/Koha/Schema/Result/UserPermission.pm
+++ b/Koha/Schema/Result/UserPermission.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::UserPermission;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::UserPermission
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<user_permissions>
+
+=head1 NAME
+
+Koha::Schema::Result::UserPermission
 
 =cut
 
@@ -79,7 +75,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 permission
@@ -94,17 +90,12 @@ __PACKAGE__->belongs_to(
   "permission",
   "Koha::Schema::Result::Permission",
   { code => "code", module_bit => "module_bit" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9dMAYxSmVQ1cVKxmnMiMkg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:94n3p5sT/Ma5uU9vqn3f+g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Userflag.pm b/Koha/Schema/Result/Userflag.pm
index 7ece4a6..4c19ecb 100644
--- a/Koha/Schema/Result/Userflag.pm
+++ b/Koha/Schema/Result/Userflag.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Userflag;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Userflag
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<userflags>
+
+=head1 NAME
+
+Koha::Schema::Result::Userflag
 
 =cut
 
@@ -58,17 +54,6 @@ __PACKAGE__->add_columns(
   "defaulton",
   { data_type => "integer", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</bit>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("bit");
 
 =head1 RELATIONS
@@ -89,8 +74,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:A4wiP/AM/pdmYrJmuiYIYg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:17qJwijyzTndpMhwPoiuQA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Virtualshelfcontent.pm b/Koha/Schema/Result/Virtualshelfcontent.pm
index dfb8d46..ee89f7d 100644
--- a/Koha/Schema/Result/Virtualshelfcontent.pm
+++ b/Koha/Schema/Result/Virtualshelfcontent.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Virtualshelfcontent;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Virtualshelfcontent
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<virtualshelfcontents>
+
+=head1 NAME
+
+Koha::Schema::Result::Virtualshelfcontent
 
 =cut
 
@@ -45,7 +41,6 @@ __PACKAGE__->table("virtualshelfcontents");
 =head2 dateadded
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -76,10 +71,9 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 1 },
   "dateadded",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "borrowernumber",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
@@ -99,7 +93,7 @@ __PACKAGE__->belongs_to(
   "biblionumber",
   "Koha::Schema::Result::Biblio",
   { biblionumber => "biblionumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 borrowernumber
@@ -114,12 +108,7 @@ __PACKAGE__->belongs_to(
   "borrowernumber",
   "Koha::Schema::Result::Borrower",
   { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 =head2 shelfnumber
@@ -134,12 +123,12 @@ __PACKAGE__->belongs_to(
   "shelfnumber",
   "Koha::Schema::Result::Virtualshelve",
   { shelfnumber => "shelfnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nhcu0n7BoSNsoY76SYSYFw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:YnveTfM6xGZwr2zKoLUJ0g
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Virtualshelfshare.pm b/Koha/Schema/Result/Virtualshelfshare.pm
index 93aa7dd..54a39db 100644
--- a/Koha/Schema/Result/Virtualshelfshare.pm
+++ b/Koha/Schema/Result/Virtualshelfshare.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Virtualshelfshare;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Virtualshelfshare
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<virtualshelfshares>
+
+=head1 NAME
+
+Koha::Schema::Result::Virtualshelfshare
 
 =cut
 
@@ -50,7 +46,6 @@ __PACKAGE__->table("virtualshelfshares");
 =head2 sharedate
 
   data_type: 'datetime'
-  datetime_undef_if_invalid: 1
   is_nullable: 1
 
 =cut
@@ -65,65 +60,45 @@ __PACKAGE__->add_columns(
   "invitekey",
   { data_type => "varchar", is_nullable => 1, size => 10 },
   "sharedate",
-  {
-    data_type => "datetime",
-    datetime_undef_if_invalid => 1,
-    is_nullable => 1,
-  },
+  { data_type => "datetime", is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 =head1 RELATIONS
 
-=head2 borrowernumber
+=head2 shelfnumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Borrower>
+Related object: L<Koha::Schema::Result::Virtualshelve>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "borrowernumber",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "borrowernumber" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
+  "shelfnumber",
+  "Koha::Schema::Result::Virtualshelve",
+  { shelfnumber => "shelfnumber" },
+  { on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
-=head2 shelfnumber
+=head2 borrowernumber
 
 Type: belongs_to
 
-Related object: L<Koha::Schema::Result::Virtualshelve>
+Related object: L<Koha::Schema::Result::Borrower>
 
 =cut
 
 __PACKAGE__->belongs_to(
-  "shelfnumber",
-  "Koha::Schema::Result::Virtualshelve",
-  { shelfnumber => "shelfnumber" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+  "borrowernumber",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "borrowernumber" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Eu/4NPwsXI+UMs5QWVsUmA
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:XpvBapVYX/6L25vRmRL9xQ
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Virtualshelve.pm b/Koha/Schema/Result/Virtualshelve.pm
index fa4759d..21e8188 100644
--- a/Koha/Schema/Result/Virtualshelve.pm
+++ b/Koha/Schema/Result/Virtualshelve.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Virtualshelve;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Virtualshelve
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<virtualshelves>
+
+=head1 NAME
+
+Koha::Schema::Result::Virtualshelve
 
 =cut
 
@@ -56,7 +52,6 @@ __PACKAGE__->table("virtualshelves");
 =head2 lastmodified
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -93,10 +88,9 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 16 },
   "lastmodified",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
   "allow_add",
   { data_type => "tinyint", default_value => 0, is_nullable => 1 },
@@ -105,41 +99,10 @@ __PACKAGE__->add_columns(
   "allow_delete_other",
   { data_type => "tinyint", default_value => 0, is_nullable => 1 },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</shelfnumber>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("shelfnumber");
 
 =head1 RELATIONS
 
-=head2 owner
-
-Type: belongs_to
-
-Related object: L<Koha::Schema::Result::Borrower>
-
-=cut
-
-__PACKAGE__->belongs_to(
-  "owner",
-  "Koha::Schema::Result::Borrower",
-  { borrowernumber => "owner" },
-  {
-    is_deferrable => 1,
-    join_type     => "LEFT",
-    on_delete     => "CASCADE",
-    on_update     => "CASCADE",
-  },
-);
-
 =head2 virtualshelfcontents
 
 Type: has_many
@@ -170,9 +133,24 @@ __PACKAGE__->has_many(
   { cascade_copy => 0, cascade_delete => 0 },
 );
 
+=head2 owner
+
+Type: belongs_to
+
+Related object: L<Koha::Schema::Result::Borrower>
+
+=cut
+
+__PACKAGE__->belongs_to(
+  "owner",
+  "Koha::Schema::Result::Borrower",
+  { borrowernumber => "owner" },
+  { join_type => "LEFT", on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:WdBpWgSdrE0l13vKgDRcGg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Aj0XoKBPMI68mc1+Gm4wEA
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Z3950server.pm b/Koha/Schema/Result/Z3950server.pm
index a185f57..21082b9 100644
--- a/Koha/Schema/Result/Z3950server.pm
+++ b/Koha/Schema/Result/Z3950server.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Z3950server;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Z3950server
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<z3950servers>
+
+=head1 NAME
+
+Koha::Schema::Result::Z3950server
 
 =cut
 
@@ -94,7 +90,7 @@ __PACKAGE__->table("z3950servers");
 
   data_type: 'enum'
   default_value: 'primary'
-  extra: {list => ["primary","secondary"]}
+  extra: {list => ["primary","secondary",""]}
   is_nullable: 0
 
 =head2 type
@@ -152,7 +148,7 @@ __PACKAGE__->add_columns(
   {
     data_type => "enum",
     default_value => "primary",
-    extra => { list => ["primary", "secondary"] },
+    extra => { list => ["primary", "secondary", ""] },
     is_nullable => 0,
   },
   "type",
@@ -174,22 +170,11 @@ __PACKAGE__->add_columns(
     size => 45,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j/AgGQDMyR5wm1wooSYYDw
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:eNyBaY0hbzCFuV0O1zt3Vg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
diff --git a/Koha/Schema/Result/Zebraqueue.pm b/Koha/Schema/Result/Zebraqueue.pm
index 25e6bf9..246331a 100644
--- a/Koha/Schema/Result/Zebraqueue.pm
+++ b/Koha/Schema/Result/Zebraqueue.pm
@@ -1,21 +1,17 @@
-use utf8;
 package Koha::Schema::Result::Zebraqueue;
 
 # Created by DBIx::Class::Schema::Loader
 # DO NOT MODIFY THE FIRST PART OF THIS FILE
 
-=head1 NAME
-
-Koha::Schema::Result::Zebraqueue
-
-=cut
-
 use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
 
-=head1 TABLE: C<zebraqueue>
+
+=head1 NAME
+
+Koha::Schema::Result::Zebraqueue
 
 =cut
 
@@ -59,7 +55,6 @@ __PACKAGE__->table("zebraqueue");
 =head2 time
 
   data_type: 'timestamp'
-  datetime_undef_if_invalid: 1
   default_value: current_timestamp
   is_nullable: 0
 
@@ -83,28 +78,16 @@ __PACKAGE__->add_columns(
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "time",
   {
-    data_type => "timestamp",
-    datetime_undef_if_invalid => 1,
+    data_type     => "timestamp",
     default_value => \"current_timestamp",
-    is_nullable => 0,
+    is_nullable   => 0,
   },
 );
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</id>
-
-=back
-
-=cut
-
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vU9ROiVUwXc7jhKt728dRg
+# Created by DBIx::Class::Schema::Loader v0.07000 @ 2013-10-31 07:41:39
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Q2GyxszPTQyLPP9pQWeecg
 
 
 # You can replace this text with custom content, and it will be preserved on regeneration
-- 
1.7.2.5