Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549

Conflicts:
	installer/data/mysql/updatedatabase.pl
	members/moremember.pl

diff --cc installer/data/mysql/kohastructure.sql
Simple merge

diff --cc installer/data/mysql/updatedatabase.pl
index 246ecf7,98f660f..fe0a5f7
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4994,25 -4993,20 +4993,40 @@@ if ( C4::Context->preference("Version"
      SetVersion($DBversion);
  }
  
 -$DBversion = "XXX";
 +$DBversion = "3.07.00.033";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("ALTER TABLE branches ADD opac_info text;");
 +    print "Upgrade to $DBversion done add opac_info to branches \n";
 +    SetVersion($DBversion);
 +}
 +
 +
 +
 +
 +$DBversion = "3.07.00.034";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN category_code VARCHAR(10) NULL DEFAULT NULL AFTER `display_checkout`");
 +    $dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN class VARCHAR(255)  NOT NULL DEFAULT '' AFTER `category_code`");
 +    $dbh->do("ALTER TABLE borrower_attribute_types ADD CONSTRAINT category_code_fk FOREIGN KEY (category_code) REFERENCES categories(categorycode)");
 +    print "Upgrade to $DBversion done (New fields category_code and class in borrower_attribute_types table)\n";
 +    SetVersion($DBversion);
 +}
 +
++$DBversion = "3.07.00.035";
+ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+     $dbh->do("ALTER TABLE issues CHANGE date_due date_due datetime");
+     $dbh->do("ALTER TABLE issues CHANGE returndate returndate datetime");
+     $dbh->do("ALTER TABLE issues CHANGE lastreneweddate lastreneweddate datetime");
+     $dbh->do("ALTER TABLE issues CHANGE issuedate issuedate datetime");
+     $dbh->do("ALTER TABLE old_issues CHANGE date_due date_due datetime");
+     $dbh->do("ALTER TABLE old_issues CHANGE returndate returndate datetime");
+     $dbh->do("ALTER TABLE old_issues CHANGE lastreneweddate lastreneweddate datetime");
+     $dbh->do("ALTER TABLE old_issues CHANGE issuedate issuedate datetime");
++    $dbh->do("alter table issuingrules add column lengthunit varchar(10) default 'days' after issuelength");
+     print "Upgrade to $DBversion done (Setting up issues tables for hourly loans)\n";
+     SetVersion($DBversion);
+ }
+ 
  =head1 FUNCTIONS
  
  =head2 DropAllForeignKeys($table)

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Simple merge

diff --cc members/moremember.pl
Simple merge