Merge remote branch 'kc/new/enh/bug_4421' into kcmaster

Conflicts:
	C4/XSLT.pm
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl

diff --cc C4/XSLT.pm
index 6020a67,75eeb16..28a70fc
--- 1/C4/XSLT.pm
--- 2/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@@ -1,7 -1,8 +1,9 @@@
  package C4::XSLT;
  # Copyright (C) 2006 LibLime
  # <jmf at liblime dot com>
 +# Parts Copyright Katrin Fischer 2011
+ # Parts Copyright ByWater Solutions 2011
+ #
  # This file is part of Koha.
  #
  # Koha is free software; you can redistribute it and/or modify it under the
@@@ -133,7 -134,7 +135,8 @@@ sub XSLTParse4Display 
                                OPACBaseURL TraceCompleteSubfields
                                UseAuthoritiesForTracings TraceSubjectSubdivisions
                                Display856uAsImage OPACDisplay856uAsImage 
-                               UseControlNumber / )
++                              UseControlNumber
+                               AlternateHoldingsField AlternateHoldingsSeparator / )
      {
          my $sp = C4::Context->preference( $syspref );
          next unless defined($sp);

diff --cc installer/data/mysql/de-DE/mandatory/sysprefs.sql
Simple merge

diff --cc installer/data/mysql/en/mandatory/sysprefs.sql
Simple merge

diff --cc installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 10d89f2,4e1b1aa..2773a72
--- 1/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
--- 2/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@@ -307,5 -306,5 +307,7 @@@ INSERT INTO systempreferences (variable
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
 +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseControlNumber',0,'If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','','YesNo');
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 +

diff --cc installer/data/mysql/it-IT/necessari/sysprefs.sql
index b167c5f,c884d59..5915497
--- 1/installer/data/mysql/it-IT/necessari/sysprefs.sql
--- 2/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@@@ -292,4 -291,6 +292,6 @@@ INSERT INTO systempreferences (variable
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaffAuthorisedValueImages','1','',NULL,'YesNo');
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACDisplay856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','OFF|Details|Results|Both','Choice');
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
 -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 -
 +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseControlNumber',0,'If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','','YesNo');
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');

diff --cc installer/data/mysql/pl-PL/mandatory/sysprefs.sql
Simple merge

diff --cc installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
Simple merge

diff --cc installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
Simple merge

diff --cc installer/data/mysql/updatedatabase.pl
index 03e75f3,6e6fb5c..5c71849
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4189,16 -4189,11 +4189,23 @@@ if (C4::Context->preference("Version") 
      print "Upgrade to $DBversion done ( Add Self-checkout by Login system preferences )\n";
  }
  
 -$DBversion = "3.03.00.XXX";
 +$DBversion = "3.03.00.039";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ShowReviewer',1,'If ON, name of reviewer will be shown above comments in OPAC',NULL,'YesNo');");
 +    print "Upgrade to $DBversion done (Add syspref ShowReviewer)\n";
 +}
 +    
 +$DBversion = "3.03.00.040";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseControlNumber',0,'If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','','YesNo');");
 +    print "Upgrade to $DBversion done (Add syspref UseControlNumber)\n";
++}
++
++$DBversion = "3.03.00.041";
+ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+     $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free')");
+     $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free')");
+     print "Upgrade to $DBversion done (Add sysprefs to control alternate holdings information display)\n";
      SetVersion ($DBversion);
  }
  

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
Simple merge

diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
Simple merge

diff --cc koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
Simple merge