Bugzilla – Attachment 19819 Details for
Bug 7298
export late orders, with # of claims and claim dates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7298: Follow-up fixing capitalization and moving supplier id
Bug-7298-Follow-up-fixing-capitalization-and-movin.patch (text/plain), 3.58 KB, created by
Katrin Fischer
on 2013-07-20 17:54:17 UTC
(
hide
)
Description:
Bug 7298: Follow-up fixing capitalization and moving supplier id
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-07-20 17:54:17 UTC
Size:
3.58 KB
patch
obsolete
>From b338b9821fd58ca97ef917f85a58e569c737023e Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sat, 20 Jul 2013 19:52:11 +0200 >Subject: [PATCH] Bug 7298: Follow-up fixing 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. >--- > acqui/lateorders-export.pl | 4 ++-- > .../prog/en/modules/acqui/lateorders.tt | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl >index f328eac..ef159c8 100755 >--- 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 8a341e5..ab34736 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -131,7 +131,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> >@@ -142,6 +141,7 @@ $(document).ready(function() { > </td> > <td> > [% lateorder.supplier %] >+ ([% lateorder.supplierid %]) > </td> > <td> > <b>[% lateorder.title |html %]</b> >@@ -183,7 +183,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> >@@ -195,7 +195,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 %] >@@ -219,7 +219,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' %] >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7298
:
7809
|
7891
|
7946
|
8333
|
10426
|
11713
|
11717
|
11721
|
11722
|
12624
|
12817
|
12818
|
15027
|
15028
|
15037
|
15038
|
15039
|
15040
|
16688
|
16689
|
16690
|
16691
|
16692
|
16956
|
19819
|
20313
|
20314
|
20315
|
20471
|
20472
|
20473
|
20474
|
21339
|
21383
|
21384
|
21385
|
21386
|
21387
|
21398
|
21523
|
22617
|
22618
|
22619
|
22620
|
22621
|
22622