From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sun, 22 Nov 2015 01:31:10 +0000 (+0100)
Subject: Bug 15202: Fix date display when transferring an order
X-Git-Tag: v16.05.00-beta~1573
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=f4b8c4ede9c83b1b78eb87c7fb31214299cbf2f2;p=srvgit

Bug 15202: Fix date display when transferring an order

The date a basket was created was not displayed
according to the dateformat system preference.

Also fixes wording of the message shown when there
are no baskets for a chosen vendor.

To test:
- Create an order with an order line
- Click on the "Transfer" link on the basket
  summary page
- Search for a vendor without open baskets
- Verify change of message shown:
  "There are no open baskets for this vendor."
- Choose another vendor with open baskets
- Verify the creation date of the basket is
  displayed correctly formatted.

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
index 261d658332..68e76e42dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -1,5 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Transfer order</title>
+[%- USE KohaDates -%]
 [% INCLUDE 'doc-head-close.inc' %]
     <style type="text/css">
     #custom-doc { width:44.46em;*width:43.39em;min-width:578px; margin:auto; text-align:left; }
@@ -71,14 +72,14 @@
                           <tr>
                             <td>[% basket.basketname %] (#[% basket.basketno %])</td>
                             <td>[% basket.createdby %]</td>
-                            <td>[% basket.creationdate %]</td>
+                            <td>[% basket.creationdate | $KohaDates %]</td>
                             <td><a href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]" onclick="return confirmtransfer();">Choose</a>
                           </tr>
                         [% END %]
                     </tbody>
                 </table>
             [% ELSE %]
-                <p>There is no open baskets for this supplier.</p>
+                <p>There are no open baskets for this vendor.</p>
             [% END %]
         [% END %]
         [% IF ( ordersloop ) %]