Bug 7298: (follow-up) fix capitalization and moving supplier id

Fixes a few capitalization errors on the late orders page like
- Claim orders
- filter
- Search results

Also moves the supplierid from the order date column to the
vendor column.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: sonia <koha@univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl
index f328eac..ef159c8 100755 (executable)
--- a/acqui/lateorders-export.pl
+++ b/acqui/lateorders-export.pl
@@ -48,9 +48,9 @@ print "ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,C
 for my $ordernumber ( @ordernumbers ) {
     my $order = GetOrder $ordernumber;
     $csv->combine(
-        "(" . $order->{supplierid} . ") " . $order->{orderdate} . " (" . $order->{latesince} . " days)",
+        $order->{orderdate} . " (" . $order->{latesince} . " days)",
         $order->{estimateddeliverydate},
-        $order->{supplier},
+        $order->{supplier} . " (" . $order->{supplierid} . ") ",
         $order->{title} . ( $order->{author} ? " Author: $order->{author}" : "" ) . ( $order->{publisher} ? " Published by: $order->{publisher}" : "" ),
         $order->{unitpricesupplier} . "x" . $order->{quantity_to_receive} . " = " . $order->{subtotal} . " (" . $order->{budget} . ")",
         $order->{basketname} . " (" . $order->{basketno} . ")",

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 4ffad8d..812f73d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -128,7 +128,6 @@ $(document).ready(function() {
                 <input type="checkbox" value="[% lateorder.ordernumber %]" data-booksellerid="[% lateorder.supplierid %]" name="ordernumber">
             </td>
             <td>
-                ([% lateorder.supplierid %])
                 [% lateorder.orderdate %]
                 ([% lateorder.latesince %] days)
             </td>
@@ -139,6 +138,7 @@ $(document).ready(function() {
             </td>
             <td>
                 [% lateorder.supplier %]
+                ([% lateorder.supplierid %])
             </td>
             <td>
                 <b>[% lateorder.title |html %]</b>
@@ -180,7 +180,7 @@ $(document).ready(function() {
     <p style="display:block;">
         <input type="button" value="Export as CSV" id="ExportSelected" />
         [% UNLESS lateorder.budget_lock %]
-            <input type="submit"  value="Claim Order" />
+            <input type="submit"  value="Claim order" />
         [% END %]
     </p>
 </form>
@@ -192,7 +192,7 @@ $(document).ready(function() {
 <div class="yui-b">
 <form action="lateorders.pl" method="get">
 <fieldset class="brief">
-<h4>Filter Results:</h4>
+<h4>Filter results:</h4>
 [% FOREACH ERROR_LOO IN ERROR_LOOP %]
 [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
 [% END %]
@@ -216,7 +216,7 @@ $(document).ready(function() {
                [% END %]
                </select>
 </ol>
-       <fieldset class="action"><input type="submit" value="filter" /></fieldset>
+       <fieldset class="action"><input type="submit" value="Filter" /></fieldset>
 </fieldset>
     </form>
 [% INCLUDE 'acquisitions-menu.inc' %]