Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
	installer/data/mysql/updatedatabase.pl

diff --cc C4/Auth.pm
Simple merge

diff --cc installer/data/mysql/updatedatabase.pl
index e79f60f,45e09da..9aa037c
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4209,18 -4209,24 +4209,36 @@@ if (C4::Context->preference("Version") 
      SetVersion ($DBversion);
  }
  
+ $DBversion = '3.03.00.042';
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;");
+     $dbh->do("ALTER TABLE items ADD INDEX itemstocknumberidx (stocknumber);");
+     print "Upgrade to $DBversion done (Change items.stocknumber to be not unique)\n";
+     SetVersion ($DBversion);
+ }
+ 
+ $DBversion = "3.03.00.043";
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ 
+     $dbh->do("INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','0','No','No')");
+     $dbh->do("INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','1','Yes','Yes')");
+ 
+       print "Upgrade to $DBversion done ( add generic boolean YES_NO authorised_values pair )\n";
+       SetVersion ($DBversion);
+ }
+ 
 +$DBversion = "3.03.00.XXX";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    print "Upgrade to $DBversion done (Remove spaces and dashes from message_attribute names)\n";
 +    $dbh->do("UPDATE message_attributes SET message_name = 'Item_Due' WHERE message_name='Item Due'");
 +    $dbh->do("UPDATE message_attributes SET message_name = 'Advance_Notice' WHERE message_name='Advance_Notice'");
 +    $dbh->do("UPDATE message_attributes SET message_name = 'Hold_Filled' WHERE message_name='Hold Filled'");
 +    $dbh->do("UPDATE message_attributes SET message_name = 'Item_Check_in' WHERE message_name='Item Check-in'");
 +    $dbh->do("UPDATE message_attributes SET message_name = 'Item_Checkout' WHERE message_name='Item Checkout'");    
 +    SetVersion ($DBversion);
 +}
 +
 +
  =head1 FUNCTIONS
  
  =head2 DropAllForeignKeys($table)

diff --cc koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
Simple merge