Bug 12904: Force browser to load new javascript files after upgrade

[koha_ffzg] / 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 5e73a24..7af950a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -1,7 +1,7 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Receive shipment from vendor [% name %]</title>
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 [% INCLUDE 'datatables.inc' %]
@@ -12,7 +12,7 @@
         "aoColumnDefs": [
           { "sType": "title-string", "aTargets" : [ "title-string" ] }
         ],
-        "sPaginationType": "four_button"
+        'bPaginate': false,
     } ) );
 
     //keep a copy of all budgets before removing the inactives
@@ -70,7 +70,7 @@
             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
             <input type="hidden" name="op" value="confirm" />
             <input type="hidden" name="invoice" value="[% invoicenumber %]" />
-            <input type="hidden" name="shipmentdate" value="[% shipmentdate %]" />
+            <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" />
             <input type="hidden" name="shipmentcost" value="[% shipmentcost %]" />
             <input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid %]" />
             <input type="submit" class="button" value="Create new invoice anyway" />
@@ -98,11 +98,7 @@
     <tbody>
     <!-- Actual Search Results -->
     [% FOREACH searchresult IN searchresults %]
-        [% UNLESS ( loop.odd ) %]
-        <tr class="highlight">
-        [% ELSE %]
         <tr>
-        [% END %]
             <td>
                 [% searchresult.number %]
             </td>
@@ -111,9 +107,9 @@
             </td>
             <td>
                 [% IF ( searchresult.code ) %]
-                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid %]">[% searchresult.code %]</a>
+                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid %]">[% searchresult.code |html %]</a>
                 [% ELSE %]
-                    <acronym title="not available">n/a</acronym>
+                    <abbr title="not available">n/a</abbr>
                 [% END %]
             </td>
             <td>
@@ -139,7 +135,7 @@
     [% IF ( number.highlight ) %]
     <span class="current">[% number.number %]</span>
     [% ELSE %]
-    <a href="parcels.pl?booksellerid=[% number.booksellerid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]&amp;type=intra">[% number.number %]</a>
+    <a href="parcels.pl?booksellerid=[% booksellerid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]&amp;type=intra">[% number.number %]</a>
     [% END %]
 [% END %]
 [% IF ( displaynext ) %]
@@ -150,14 +146,14 @@
 [% END %]
 
     <div id="parcels_new_parcel">
-        <form method="get" action="parcels.pl">
+        <form method="get" action="parcels.pl" class="validated">
     <fieldset class="rows">
     <legend>Receive a new shipment</legend>
        <ol> <li>
-            <label for="invoice">Vendor invoice </label>
+            <label for="invoice" class="required">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" class="focus" />
+            <input type="text" size="20" id="invoice" name="invoice" class="focus required" required="required" />
         </li>
                [% IF ( gst ) %]
         <li>
@@ -172,7 +168,7 @@
         </li> -->
          <li>
             <label for="shipmentdate">Shipment date: </label>
-            <input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today %]" class="datepicker" />
+            <input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today | $KohaDates %]" class="datepicker" />
             <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
         </li>
         <li>
@@ -180,7 +176,7 @@
             <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
         </li>
         <li>
-            <label for="shipmentcost_budgetid">Fund: </label>
+            <label for="shipmentcost_budgetid">Shipping fund: </label>
             <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
                 <option value="">No fund</option>
                 [% FOREACH budget IN budgets %]
@@ -191,7 +187,7 @@
                     [% END %]
                 [% END %]
             </select>
-            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show all:</label>
+            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
             <input type="checkbox" id="showallfunds" />
 
         </li>
@@ -209,8 +205,8 @@
         <ol>
             <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li>
             <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
-            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br /> 
-                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
+            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" class="datepicker" /><br />
+                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" class="datepicker" /></li>
             <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
                 <option value="invoicenumber">Invoice number</option>
                 <option value="shipmentdate">Shipment date</option>