Bugzilla – Attachment 17692 Details for
Bug 10124
Pending orders: ergonomic improvement
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10124: Add basket group name in filters
Bug-10124-Add-basket-group-name-in-filters.patch (text/plain), 6.35 KB, created by
Jonathan Druart
on 2013-04-26 07:38:55 UTC
(
hide
)
Description:
Bug 10124: Add basket group name in filters
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-04-26 07:38:55 UTC
Size:
6.35 KB
patch
obsolete
>From 6279f3b2c7be3af54b5de9b7457450be4916b98b Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 26 Apr 2013 09:30:23 +0200 >Subject: [PATCH] Bug 10124: Add basket group name in filters > >This patch adds a new filter "basket group name" for pending orders >searches. > >Test plan: >Try different filters and check that results are consistent. >--- > acqui/parcel.pl | 3 + > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 76 ++++++++++---------- > 2 files changed, 39 insertions(+), 40 deletions(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index ad0648d..57e0e11 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -219,12 +219,14 @@ if(!defined $invoice->{closedate}) { > my $ean = $input->param('eanfilter') || ''; > my $basketname = $input->param('basketfilter') || ''; > my $orderno = $input->param('orderfilter') || ''; >+ my $basketgroupname = $input->param('basketgroupnamefilter') || ''; > $pendingorders = SearchOrders({ > booksellerid => $booksellerid, > basketname => $basketname, > ordernumber => $orderno, > search => $search, > ean => $ean, >+ basketgroupname => $basketgroupname, > pending => 1, > }); > $template->param( >@@ -232,6 +234,7 @@ if(!defined $invoice->{closedate}) { > eanfilter => $ean, > basketfilter => $basketname, > orderfilter => $orderno, >+ basketgroupnamefilter => $basketgroupname, > ); > }else{ > $pendingorders = SearchOrders({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index fae8473..6cde848 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -186,7 +186,7 @@ > <tbody class="filterclass"> > [% FOREACH loop_order IN loop_orders %] > <tr> >- <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td> >+ <td class="basketfilterclass">[% loop_order.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a>)</td> > <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td> > <td class="summaryfilterclass"> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a> >@@ -304,10 +304,10 @@ > <th></th> > </tr> > </tfoot> >- <tbody class="filterclass"> >- [% FOREACH loop_receive IN loop_received %] >+ <tbody class="filterclass"> >+ [% FOREACH loop_receive IN loop_received %] > <tr> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td> >+ <td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td> > <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a> > [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] >@@ -364,45 +364,41 @@ > </div> > <div class="yui-b"> > <form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post"> >- <fieldset class="brief"> >- >- <h4>Filter</h4> >- >- <ol> >- >- <li> >- <label for="summaryfilter">ISBN, author or title :</label> >- <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/> >- </li> >- >- <li> >- <label for="basketfilter">Basket :</label> >- <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/> >- </li> >- >- <li> >- <label for="orderfilter">Order line :</label> >- <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/> >- </li> >- [% IF (UNIMARC) %] >+ <fieldset class="brief"> >+ <h4>Filter</h4> >+ <ol> >+ <li> >+ <label for="summaryfilter">ISBN, author or title :</label> >+ <input type="text" name="summaryfilter" id="summaryfilter" value="[% summaryfilter %]"/> >+ </li> >+ <li> >+ <label for="basketfilter">Basket :</label> >+ <input type="text" name="basketfilter" id="basketfilter" value="[% basketfilter %]"/> >+ </li> >+ <li> >+ <label for="basketgroupnamefilter">Basket group name :</label> >+ <input type="text" name="basketgroupnamefilter" id="basketgroupnamefilter" value="[% basketgroupnamefilter %]" /> >+ </li> >+ <li> >+ <label for="orderfilter">Order line :</label> >+ <input type="text" name="orderfilter" id="orderfilter" value="[% orderfilter %]"/> >+ </li> >+ [% IF (UNIMARC) %] > <li> >- <label for="eanfilter">EAN :</label> >- <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/> >+ <label for="eanfilter">EAN :</label> >+ <input type="text" name="eanfilter" id="eanfilter" value="[% eanfilter %]"/> > </li> >- [% END %] >- </ol> >- <fieldset class="action"> >- <input type="hidden" value="search" name="op" /> >- <input type="hidden" value="[% invoiceid %]" name="invoiceid" /> >- <input type="submit" value="Filter" /> >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a> >- </fieldset> >- >- >- </fieldset> >- </form> >+ [% END %] >+ </ol> >+ <fieldset class="action"> >+ <input type="hidden" value="search" name="op" /> >+ <input type="hidden" value="[% invoiceid %]" name="invoiceid" /> >+ <input type="submit" value="Filter" /> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a> >+ </fieldset> >+ </fieldset> >+</form> > [% INCLUDE 'acquisitions-menu.inc' %] > </div> > </div> > [% INCLUDE 'intranet-bottom.inc' %] >- >-- >1.7.10.4
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 10124
:
17691
|
17692
|
17693
|
17701
|
18493
|
18494
|
18495
|
18501
|
18502
|
18503
|
19309
|
19636
|
19637
|
19638
|
19639
|
19640