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

Conflicts:
	installer/data/mysql/updatedatabase.pl

diff --cc admin/branches.pl
Simple merge

diff --cc installer/data/mysql/updatedatabase.pl
index 2c2d7ce,608a9ae..6b1d624
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4259,18 -4258,41 +4258,52 @@@ if ( C4::Context->preference("Version"
      SetVersion($DBversion);
  }
  
- 
+ $DBversion = '3.03.00.047';
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("ALTER TABLE borrowers ADD `state` mediumtext AFTER city;");
+     $dbh->do("ALTER TABLE borrowers ADD `B_state` mediumtext AFTER B_city;");
+     $dbh->do("ALTER TABLE borrowers ADD `altcontactstate` mediumtext AFTER altcontactaddress3;");
+     $dbh->do("ALTER TABLE deletedborrowers ADD `state` mediumtext AFTER city;");
+     $dbh->do("ALTER TABLE deletedborrowers ADD `B_state` mediumtext AFTER B_city;");
+     $dbh->do("ALTER TABLE deletedborrowers ADD `altcontactstate` mediumtext AFTER altcontactaddress3;");
+     print "Upgrade to $DBversion done (Add state field to patron's addresses)\n";
+ }
+ 
+ $DBversion = '3.03.00.048';
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("ALTER TABLE branches ADD `branchstate` mediumtext AFTER `branchcity`;");
+     print "Upgrade to $DBversion done (Add state to branch address)\n";
+     SetVersion ($DBversion);
+ }
+ 
+ $DBversion = '3.03.00.049';
+ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+     $dbh->do("ALTER TABLE `accountlines` ADD `note` text NULL default NULL");
+     $dbh->do("ALTER TABLE `accountlines` ADD `manager_id` int( 11 ) NULL ");
+     print "Upgrade to $DBversion done (adding note and manager_id fields in accountlines table)\n";
+     SetVersion($DBversion);
+ }
+ 
+ $DBversion = "3.03.00.050";
+ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+     $dbh->do("
+       INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
+       ");
+     print "Upgrade to $DBversion done (Adding OpacHiddenItems syspref)\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 members/moremember.pl
Simple merge