Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/

diff --combined koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
index f2d9c64,9759e2e..dd9bd60
--- 1/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
--- 2/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
@@@ -31,7 -31,7 +31,7 @@@
      <input type="hidden" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" />
      <input type="hidden" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" />
      <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
 -    <input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
 +    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      
      <!-- TMPL_LOOP name="serverloop" -->
          <p>
@@@ -57,15 -57,16 +57,16 @@@
          <th>&nbsp;</th>
      </tr>
      <!-- TMPL_IF name="breeding_loop" -->
-     <!-- TMPL_LOOP name="breeding_loop" --> 
+     <!-- TMPL_LOOP name="breeding_loop" -->
+         <!-- TMPL_IF NAME="breedingid" -->
          <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
              <td><!-- TMPL_VAR name="server" --></td>
              <td><!-- TMPL_VAR NAME="title" --></td>
              <td><!-- TMPL_VAR NAME="author" --></td>
              <td><!-- TMPL_VAR NAME="isbn" --></td>
              <td><a href="javascript:Import(<!-- TMPL_VAR NAME="breedingid" -->,<!-- TMPL_VAR NAME="biblionumber" -->)">Import</a></td> 
-         
          </tr>
+         <!-- /TMPL_IF -->
      <!-- /TMPL_LOOP -->
      <!-- TMPL_ELSE -->
          <tr><td colspan="6">Nothing found</td></tr>
@@@ -77,8 -78,8 +78,8 @@@
  <!-- TMPL_IF name="numberpending" --><h3 align="center">Still <!-- TMPL_VAR NAME="numberpending" --> servers to search</h3><!-- /TMPL_IF -->
  <script language="JavaScript" type="text/javascript">
      function Import(GetThisOne,biblionumber) {
-         opener.document.location= "../cataloguing/addbiblio.pl?biblionumber="+biblionumber+"&z3950=1&frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->&breedingid="+GetThisOne;
-         self.close();
+         opener.document.location="../cataloguing/addbiblio.pl?biblionumber="+biblionumber+"&z3950=1&frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->&breedingid="+GetThisOne;
+         window.close();
          return false;
      }
  </script>

diff --combined koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index d58441c,379962a..3c7fa88
--- 1/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
--- 2/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@@ -137,6 -137,28 +137,28 @@@ var patternchoice = document.getElement
          document.getElementById("more_options").innerHTML = '';
          document.f.irreg_check.value=1; 
          break;
+     case "8":
+         var d = new Date();
+         var sYear = d.getFullYear();
+         document.f.add1.value=1;
+         document.f.add2.value=1;
+         document.f.add3.value='';
+         document.f.every1.value=12;
+         document.f.every2.value=1;
+         document.f.every3.value='';
+         document.f.whenmorethan1.value=9999999;
+         document.f.whenmorethan2.value=12;
+         document.f.whenmorethan3.value='';
+         document.f.setto1.value=0;
+         document.f.setto2.value=1;
+         document.f.setto3.value='';
+         document.f.lastvalue1.value=sYear;
+         document.f.lastvalue2.value='1';
+         document.f.lastvalue3.value='';
+         document.f.periodicity.value=1;
+         document.f.numberingmethod.value=_('{X}/{Y}');
+         display_table(0);
+         break;
      default:
          document.f.add1.value=1;
          document.f.add2.value='';
@@@ -352,6 -374,13 +374,13 @@@ function irregularity_check()
      var expected; 
      var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
      switch(periodicity){
+     case "12":
+         if(rollover < 730) expected =730;
+         if(rollover > 730) {
+             expectedover=730;
+             toobig=1;
+         }
+         break;
      case "1":
          if(rollover < 365) expected =365;
          if(rollover > 365) {
@@@ -359,6 -388,13 +388,13 @@@
              toobig=1;
          }
          break;
+     case "13":
+         if(rollover < 156) expected =156;
+         if(rollover > 156) {
+             expectedover=156;
+             toobig=1;
+         }
+         break;
      case "2":
          if(rollover < 52) expected =52;
          if(rollover > 52){
@@@ -426,7 -462,7 +462,7 @@@
          break;
      }
      if(expected){
-         if(expected == 365){
+         if(expected == 365 || expected==730){
              var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
              errortext += _("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
              for(var j=0;j<daynames.length;j++){
@@@ -676,7 -712,7 +712,7 @@@ function check_input(e)
                  <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
                  (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>)
                  <a href="#" onClick="Plugin(f)">Search for Biblio</a> <!--TMPL_UNLESS Name="mod"--> |
-                 <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Create Biblio</a><!--/TMPL_UNLESS-->
+                 <a href="#" onClick="Create_biblio(f)">Create Biblio</a><!--/TMPL_UNLESS-->
              </td>
          </tr>
          <tr>
@@@ -695,12 -731,12 +731,12 @@@
              </td>
          </tr>
          <tr>
 -            <td><label>Notes</label></td>
 -            <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
 +            <td><label>Librarian's notes</label></td>
 +            <td><textarea name="internalnotes" cols="30" rows="2"><!-- TMPL_VAR name="internalnotes" --></textarea></td>
          </tr>
          <tr>
 -            <td><label>Management Notes</label></td>
 -            <td><textarea name="internalnotes" cols="30" rows="2"><!-- TMPL_VAR name="internalnotes" --></textarea></td>
 +            <td><label>OPAC's note</label></td>
 +            <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
          </tr>
          <tr>
              <td>Patron alert with </td>
@@@ -759,13 -795,37 +795,37 @@@
              <td>
                  <select name="periodicity" size="1" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
                  <option value="" selected>-- please choose --</option>
-                 <option value="">Unknown</option>
+                 <!-- TMPL_IF name="periodicity16" -->
+                 <option value="16" selected>Without Periodicity</option>
+                 <!-- TMPL_ELSE -->
+                     <option value="16">Without Periodicity</option>
+                 <!-- /TMPL_IF -->
+                 <!-- TMPL_IF name="periodicity48" -->
+                 <option value="48" selected>Unknown</option>
+                 <!-- TMPL_ELSE -->
+                 <option value="48">Unknown</option>
+                 <!-- /TMPL_IF -->
+                 <!-- TMPL_IF name="periodicity32" -->
+                 <option value="32" selected>Irregular</option>
+                 <!-- TMPL_ELSE -->
+                     <option value="32">Irregular</option>
+                 <!-- /TMPL_IF -->
  
+                 <!-- TMPL_IF name="periodicity12" -->
+                     <option value="12" selected>2/day</option>
+                 <!-- TMPL_ELSE -->
+                     <option value="12">2/day</option>
+                 <!-- /TMPL_IF -->
                  <!-- TMPL_IF name="periodicity1" -->
                      <option value="1" selected>1/day</option>
                  <!-- TMPL_ELSE -->
                      <option value="1">1/day</option>
                  <!-- /TMPL_IF -->
+                 <!-- TMPL_IF name="periodicity13" -->
+                     <option value="13" selected>3/week</option>
+                 <!-- TMPL_ELSE -->
+                     <option value="13">3/week</option>
+                 <!-- /TMPL_IF -->
                  <!-- TMPL_IF name="periodicity2" -->
                      <option value="2" selected>1/week</option>
                  <!-- TMPL_ELSE -->
@@@ -857,6 -917,11 +917,11 @@@
                      <!-- TMPL_ELSE -->
                          <option value="6">Seasonal only</option>
                      <!-- /TMPL_IF -->
+                     <!-- TMPL_IF name="numberpattern8" -->
+                         <option value="8" selected>Year/Number</option>
+                     <!-- TMPL_ELSE -->
+                         <option value="8">Year/Number</option>
+                     <!-- /TMPL_IF -->          
                      <!-- TMPL_IF name="numberpattern7" -->
                          <option value="7" selected>None of the above</option>
                      <!-- TMPL_ELSE -->
@@@ -1020,6 -1085,10 +1085,10 @@@
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  
  <script language="JavaScript" type="text/javascript">
+ function Create_biblio(f)
+ {
+    window.open('/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup','FindABibIndex','width=1024,height=768,toolbar=no,scrollbars=yes');
+ }
  
  function Plugin(f)
  {

diff --combined misc/zebra/ccl.properties
index 6292537,110345a..8e4e372
--- 1/misc/zebra/ccl.properties
--- 2/misc/zebra/ccl.properties
+++ b/misc/zebra/ccl.properties
@@@ -793,7 -793,7 +793,7 @@@ ut Title-unifor
  #                           for an authority to be searched subfield $9 in the
  #                           for cataloging purposes.        following: 700,701,702,710,
  #                                                           711,712 and some 6XX fields (Unimarc)
 -Authority-number           1=8910
 +Authority-Number           1=8910
  an Authority-Number
  Koha-Auth-Number Authority-Number
  
@@@ -962,6 -962,7 +962,7 @@@ l-format 1=870
  # BRANCH (of local library)
  branch 1=1033
  
+ Illustration-code 1=Illustration-code 
  # Item Type
  
  # Year limit