Merge remote-tracking branch 'origin/new/bug_7548'

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / histsearch.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt

index 495f313..1d6c242 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -1,9 +1,10 @@
+[% USE KohaDates %]
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search Results[% ELSE %]Order search[% END %]</title>
  [% INCLUDE 'doc-head-close.inc' %]
  [% INCLUDE 'calendar.inc' %]
  </head>
-<body>
+<body id="acq_histsearch" class="acq">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'acquisitions-search.inc' %]
  
@@ -21,6 +22,7 @@
                 <ol>
                 <li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
                 <li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
+               <li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
                 <li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
                 <li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
                 <li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
@@ -55,6 +57,7 @@
                 </li>
                 </ol>
         </fieldset>
+    <input type="hidden" name="do_search" value="1" />
         <fieldset class="action"><input type="submit" value="Search" /></fieldset>
         </form>[% END %]
         [% IF ( suggestions_loop ) %]<h1>Search Results</h1>
@@ -77,16 +80,16 @@
                      <td>[% suggestions_loo.basketname %] (<a href="basket.pl?basketno=[% suggestions_loo.basketno %]">[% suggestions_loo.basketno %]</a>)</td>
                         <td>[% suggestions_loo.groupname %] (<a href="basketgroup.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.basketgroupid %]</a>)</td>
                                         <td>[% IF ( suggestions_loo.invoicenumber ) %]
-                                               <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&amp;supplierid=[% suggestions_loo.id %]&amp;datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
+                                               <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&amp;booksellerid=[% suggestions_loo.id %]&amp;datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
                                             [% ELSE %]
                                                 &nbsp;
                                             [% END %]
                                         </td>
                                         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
-                        <br />[% suggestions_loo.author %]</td>
-                                       <td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
-                                       <td>[% suggestions_loo.creationdate %]</td>
-                                       <td>[% suggestions_loo.datereceived %]</td>
+                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
+                                       <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
+                                       <td>[% suggestions_loo.creationdate | $KohaDates %]</td>
+                                       <td>[% suggestions_loo.datereceived | $KohaDates %]</td>
                                         <td>[% suggestions_loo.quantity %]</td>
                                         <td>[% suggestions_loo.ecost %]</td>
                                 </tr>