Merge remote branch 'kc/new/bug_5949' into kcmaster

diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 52e9dc7,ca9dcdf..0eacf19
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@@ -68,7 -68,6 +68,7 @@@ if (ok) 
  ff.submit();
  
  }
 +
  $(document).ready(function() 
      {
          //We apply the fonction only for modify option
@@@ -78,29 -77,19 +78,29 @@@
              // if user decreases the quantity
              if($(this).val() < <!-- TMPL_VAR name="quantityrec" -->) 
              {
 -                alert("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog");   
 +                alert(_("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog"));
                  return true;
              } 
              else 
              {
                  // if user increases the quantity
 -                alert("You can't add a new item, please create a new order line");
 +                alert(_("You can't add a new item, please create a new order line"));
                  // and we replace the original value
                  $(this).val(<!-- TMPL_VAR name="quantityrec" -->)
                  return false;
              }
          });
          <!-- /TMPL_IF -->
 +        
 +        $('#showallbudgets').click(function() {
 +            if ( $('#budget_id .b_inactive').is(":visible") )
 +            {
 +            $('#budget_id .b_inactive').hide();
 +            }
 +            else {
 +            $('#budget_id .b_inactive').show();
 +            }
 +        });
      });
  //]]>
  </script>
@@@ -171,7 -160,9 +171,9 @@@
  <fieldset class="rows">
          <legend>
              Catalog details
-             <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR NAME= "biblionumber"-->"> Edit record</a></span>
+             <!-- TMPL_IF name="biblionumber" -->
+                 <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR NAME= "biblionumber"-->"> Edit record</a></span>
+             <!-- /TMPL_IF -->
          </legend>
          <!-- TMPL_UNLESS name="existing" -->
          <input type="hidden" name="existing" value="no" />
@@@ -313,14 -304,10 +315,14 @@@
                      <!-- TMPL_IF NAME="b_sel" -->
                          <option value="<!-- TMPL_VAR NAME='b_id' -->" selected="selected"><!-- TMPL_VAR NAME="b_txt" --></option>
                      <!-- TMPL_ELSE -->
 -                        <option value="<!-- TMPL_VAR NAME='b_id' -->"><!-- TMPL_VAR NAME="b_txt" --></option>
 +                        <!-- TMPL_IF NAME="b_active" --><option value="<!-- TMPL_VAR NAME='b_id' -->"><!-- TMPL_VAR NAME="b_txt" --></option>
 +                        <!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME='b_id' -->" class="b_inactive" style="display : none;"><!-- TMPL_VAR NAME="b_txt" --></option>    
 +                        <!-- /TMPL_IF -->
                      <!-- /TMPL_IF -->
                  <!-- /TMPL_LOOP -->
                  </select>
 +                <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show all:</label>
 +                <input type="checkbox" id="showallbudgets" />
                  <!--/TMPL_IF-->
              </li>
                <li>
@@@ -405,7 -392,7 +407,7 @@@
              </li>
              <li>
                  <label for="notes">Notes: </label>
 -                <textarea id="notes" cols="30" rows="3" name="notes"></textarea>
 +                <textarea id="notes" cols="30" rows="3" name="notes" ><!-- TMPL_VAR name="notes"--></textarea>
              </li>
              <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                  <label for="sort1">Statistic 1: </label>