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

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

index 78f7cb5..622604b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -1,12 +1,13 @@
+[% USE KohaDates %]
  [% INCLUDE 'doc-head-open.inc' %]
  <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
  [% INCLUDE 'doc-head-close.inc' %]
  </head>
-<body>
+<body id="acq_spent" 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; Spent [% fund %]</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; Spent - [% fund_code %]</div>
  
  <div id="doc3" class="yui-t2">
  
@@ -14,7 +15,7 @@
      <div id="yui-main">
          <div class="yui-b">
  
-<h1>Bookfund [% fund %]</h1>
+<h1>Fund: [% fund_code %]</h1>
  <h2>Spent</h2>
  
  
@@ -46,13 +47,13 @@
             [% order.title %]
         </td>
         <td class="cell">
-            <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
+            <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&amp;biblio=[% order.biblionumber %]&amp;invoice=[% order.booksellerinvoicenumber %]&amp;booksellerid=[% order.booksellerid %]&amp;catview=yes">[% order.ordernumber %]</a>
         </td>
         <td class="cell">
-           <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
+           <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid %]">[% order.booksellerid %]</a>
         </td>
         <td class="cell">
-           <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
+           <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&amp;booksellerid=[% order.booksellerid %]&amp;datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
         </td>
         <td class="cell">
             [% order.itype %]
@@ -66,11 +67,11 @@
         <td class="cell" align="right">
             [% order.freight %]
         </td>
-       <td class="cell">
-           [% order.entrydate %]
+       <td class="cell" align="right">
+           [% order.entrydate | $KohaDates %]
         </td>
-       <td class="cell">
-           [% order.datereceived %]
+       <td class="cell" align="right">
+           [% order.datereceived | $KohaDates %]
         </td>
         <td class="cell" align="right">
             [% order.subtotal %]