Bug 8596 - Reports interface date picker doesn't force ISO formatted dates

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

index 9bba1ad..fbfa57a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -1,12 +1,26 @@
+[% USE KohaDates %]
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
  [% INCLUDE 'doc-head-close.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[
+ $(document).ready(function() {
+    var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "sPaginationType": "four_button"
+    } ) );
+ });
+ //]]>
+</script>
  </head>
-<body>
+<body id="acq_ordered" class="acq">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'acquisitions-search.inc' %]
  
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Ordered - [% fund_code %]</div>
  
  <div id="doc3" class="yui-t2">
  
@@ -14,7 +28,7 @@
      <div id="yui-main">
          <div class="yui-b">
  
-<h1>Budgets &amp; Bookfunds</h1>
+<h1>Fund: [% fund_code %]</h1>
  <h2>Ordered</h2>
  
  <table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
@@ -22,14 +36,15 @@
      <tr>
          <th> Title </th>
         <th> Order </th>
+       <th> Vendor </th>
         <th> Itemtype </th>
-       <th> Left on Order </th>
+    <th> Left on order </th>
         <th> Estimated cost per unit </th>
-       <th> Budget Date </th>
+    <th> Date ordered </th>
         <th> Subtotal </th>
      </tr>
      </thead>
-
+    <tbody>
  [% FOREACH order IN ordered %]
      [% IF loop.odd %]
          <tr class="highlight">
@@ -40,7 +55,14 @@
             [% order.title %]
         </td>
         <td class="cell">
-           <a href=/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&booksellerid=[% order.booksellerid %]&basketno=[% order.basketno %]">[% order.ordernumber %]</a>
+        [% IF ( CAN_user_acquisition_order_manage ) %]
+            <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber %]&amp;booksellerid=[% order.booksellerid %]&amp;basketno=[% order.basketno %]">[% order.ordernumber %]</a>
+        [% ELSE %]
+            [% order.ordernumber %]
+        [% END %]
+       </td>
+       <td class="cell">
+           <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid %]">[% order.booksellerid %]</a>
         </td>
         <td class="cell">
             [% order.itype %]
@@ -51,15 +73,15 @@
         <td class="cell" align="right">
             [% order.ecost %]
         </td>
-       <td class="cell">
-           [% order.budgetdate %]
+       <td class="cell" align="right">
+           [% order.entrydate | $KohaDates %]
         </td>
         <td class="cell" align="right">
             [% order.subtotal %]
         </td>
      </tr>
  [% END %]
-
+    </tbody>
      <tfoot>
      <tr>
          <td> Total </td>
@@ -68,6 +90,7 @@
          <td> </td>
          <td> </td>
          <td> </td>
+       <td> </td>
          <td align="right">
              [% total %]
          </td>