Bug 10862: (follow-up) fix a couple of issues

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / parcels.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 26e4af8..8a4096f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -4,18 +4,30 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
-[% IF (dateformat == 'metric') %]
-    dt_add_type_uk_date();
-[% END %]
     var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+          { "sType": "title-string", "aTargets" : [ "title-string" ] }
+        ],
         "sPaginationType": "four_button"
     } ) );
+
+    //keep a copy of all budgets before removing the inactives
+    var budgetId = $("#shipmentcost_budgetid");
+    var disabledBudgetsCopy = budgetId.html();
+    $('.b_inactive').remove();
+
+    $('#showallfunds').click(function() {
+        if ($(this).is(":checked")) {
+            budgetId.html(disabledBudgetsCopy); //Puts back all the funds
+        }
+        else {
+            $('.b_inactive').remove();
+        }
+    });
  });
  //]]>
 </script>
@@ -34,7 +46,7 @@
 
 [% IF ( error_failed_to_create_invoice ) %]
     <div id="error" class="dialog error">
-        <p>An error has occured. Invoice cannot be created.</p>
+        <p>An error has occurred. Invoice cannot be created.</p>
     </div>
 [% END %]
 <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1>
@@ -76,7 +88,7 @@
     <thead>
         <tr>
             <th>Line</th>
-            <th>Date received</th>
+            <th class="title-string">Date received</th>
             <th>Invoice number</th>
             <th>Item count</th>
             <th>Biblio count</th>
@@ -95,7 +107,7 @@
                 [% searchresult.number %]
             </td>
             <td>
-                [% searchresult.datereceived %]
+                <span title="[% searchresult.datereceived %]">[% searchresult.datereceived | $KohaDates %]</span>
             </td>
             <td>
                 [% IF ( searchresult.code ) %]
@@ -145,7 +157,7 @@
             <label for="invoice">Vendor invoice </label>
             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
             <input type="hidden" name="op" value="new" />
-                       <input type="text" size="20" id="invoice" name="invoice" />
+                       <input type="text" size="20" id="invoice" name="invoice" class="focus" />
         </li>
                [% IF ( gst ) %]
         <li>
@@ -164,7 +176,7 @@
             <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
         </li>
         <li>
-            <label for="shipmentcost">Shipment cost: </label>
+            <label for="shipmentcost">Shipping cost: </label>
             <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
         </li>
         <li>
@@ -172,9 +184,16 @@
             <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
                 <option value="">No fund</option>
                 [% FOREACH budget IN budgets %]
-                    <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
+                    [% IF ( budget.b_active ) %]
+                        <option value="[% budget.b_id %]">[% budget.b_txt %]</option>
+                    [% ELSE %]
+                        <option value="[% budget.b_id %]" class="b_inactive">[% budget.b_txt %] (inactive)</option>
+                    [% END %]
                 [% END %]
             </select>
+            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show all:</label>
+            <input type="checkbox" id="showallfunds" />
+
         </li>
                </ol>
     </fieldset>