projects / koha_ffzg / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 9503 Correct name of parameter passed to parcel.pl
[koha_ffzg] / 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 5de1668..94d1bc7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -3,11 +3,15 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search results[% ELSE %]Order search[% END %]</title>
 <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>
 <script type="text/javascript">
 //<![CDATA[
+[% IF (dateformat == 'metric') %]
+    dt_add_type_uk_date();
+[% END %]
  $(document).ready(function() {
     var histsearcht = $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
@@ -15,7 +19,6 @@
  });
  //]]>
 </script>
-[% INCLUDE 'calendar.inc' %]
 </head>
 <body id="acq_histsearch" class="acq">
 [% INCLUDE 'header.inc' %]
@@ -35,37 +38,23 @@
                <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="isbn">ISBN: </label> <input type="text" name="isbn" id="isbn" value="[% isbn %]" /></li>
+                [% IF (UNIMARC) %]
+        <li><label for="ean">EAN: </label> <input type="text" name="ean" id="ean" value="[% ean %]" /></li>
+                [% END %]
                <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>
+        <li>
+            <label for="basketgroupname">Basket group:</label>
+            <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" />
+        </li>
                <li><label for="from">From: </label> 
-                       <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" />
-                       <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+        <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                </li>
                <li><label for="to">To: </label> 
-                       <input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" />
-                       <img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
-                       <script type="text/javascript">
-                               // return true if the date is blocked.
-                               function disable_from(date) {var limit = get_Calendar_limit(date,'to'  ); return (limit && limit < date);}  // true or false
-                               function disable_to  (date) {var limit = get_Calendar_limit(date,'from'); return (limit && limit > date);}  // true or false
-                               Calendar.setup({
-                                       inputField : "from",
-                                       ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                       button : "openCalendarFrom",
-                                       disableFunc : disable_from,
-                                       dateStatusFunc : disable_from
-                               });
-                               Calendar.setup({
-                                       inputField : "to",
-                                       ifFormat : "[% DHTMLcalendar_dateformat %]",
-                                       button : "openCalendarTo",
-                                       disableFunc : disable_to,
-                                       dateStatusFunc : disable_to
-                    });
-                       </script>
+        <input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" class="datepickerto" />
                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                </li>
                </ol>
@@ -94,9 +83,15 @@
                        [% FOREACH suggestions_loo IN suggestions_loop %]
                                <tr>
                     <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.basketgroupid ) %]
+                            [% suggestions_loo.groupname %] (<a href="basketgroup.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.basketgroupid %]</a>)
+                        [% ELSE %]
+                            &nbsp;
+                        [% END %]
+                    </td>
                                        <td>[% IF ( suggestions_loo.invoicenumber ) %]
-                                               <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>
+                                               <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% suggestions_loo.invoicenumber %]&amp;booksellerid=[% suggestions_loo.id %]&amp;datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
                                            [% ELSE %]
                                                &nbsp;
                                            [% END %]
@@ -106,7 +101,11 @@
                         <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>
+                        [% IF suggestions_loo.datereceived %]
+                            [% suggestions_loo.datereceived | $KohaDates %]
+                        [% END %]
+                    </td>
                                        <td>[% suggestions_loo.quantity %]</td>
                                        <td>[% suggestions_loo.ecost %]</td>
                                </tr>
Unnamed repository; edit this file 'description' to name the repository.