Bugzilla – Attachment 20284 Details for
Bug 10530
PO number search
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
PO number search
0002-Bug-10530-PO-number-search.patch (text/plain), 5.87 KB, created by
Amit Gupta
on 2013-08-13 05:18:04 UTC
(
hide
)
Description:
PO number search
Filename:
MIME Type:
Creator:
Amit Gupta
Created:
2013-08-13 05:18:04 UTC
Size:
5.87 KB
patch
obsolete
>From e1e198fd50aea666ce41b2d64df551e7bf3fdbac Mon Sep 17 00:00:00 2001 >From: Amit Gupta <amitddng135@gmail.com> >Date: Tue, 13 Aug 2013 10:44:04 +0530 >Subject: [PATCH 2/3] Bug 10530 - PO number search > >Ability to search the purchase order > >Test plan: >1) Create an basket >2) Create an order >3) Click on order search link and click on plus symbol >4) Purchase order no input box will come give the no and click >on sumbit >5) Click on Advance search link search order screen will appear enter value >in the purcahse ordernumber textbox. >--- > C4/Acquisition.pm | 9 ++++++++- > acqui/histsearch.pl | 3 +++ > .../prog/en/includes/acquisitions-search.inc | 1 + > .../prog/en/modules/acqui/histsearch.tt | 6 ++++++ > 4 files changed, 18 insertions(+), 1 deletion(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index d40d517..a62dab4 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -1941,6 +1941,7 @@ sub GetHistory { > my $from_placed_on = $params{from_placed_on}; > my $to_placed_on = $params{to_placed_on}; > my $basket = $params{basket}; >+ my $purchaseordernumber = $params{purchaseordernumber}; > my $booksellerinvoicenumber = $params{booksellerinvoicenumber}; > my $basketgroupname = $params{basketgroupname}; > my @order_loop; >@@ -1969,7 +1970,8 @@ sub GetHistory { > aqorders.invoiceid, > aqinvoices.invoicenumber, > aqbooksellers.id as id, >- aqorders.biblionumber >+ aqorders.biblionumber, >+ aqorders.purchaseordernumber > FROM aqorders > LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno > LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id >@@ -2034,6 +2036,11 @@ sub GetHistory { > push @query_params, "%$booksellerinvoicenumber%"; > } > >+ if ($purchaseordernumber) { >+ $query .= " AND aqorders.purchaseordernumber LIKE ? "; >+ push @query_params, "%$purchaseordernumber%"; >+ } >+ > if ($basketgroupname) { > $query .= " AND aqbasketgroups.name LIKE ? "; > push @query_params, "%$basketgroupname%"; >diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl >index 971fc18..012ce43 100755 >--- a/acqui/histsearch.pl >+++ b/acqui/histsearch.pl >@@ -67,6 +67,7 @@ my $ean = $input->param('ean'); > my $basket = $input->param( 'basket' ); > my $basketgroupname = $input->param('basketgroupname'); > my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' ); >+my $purchaseordernumber = $input->param( 'purchaseordernumber' ); > my $do_search = $input->param('do_search') || 0; > my $from_placed_on = C4::Dates->new($input->param('from')); > my $to_placed_on = C4::Dates->new($input->param('to')); >@@ -110,6 +111,7 @@ if ($do_search) { > basket => $basket, > booksellerinvoicenumber => $booksellerinvoicenumber, > basketgroupname => $basketgroupname, >+ purchaseordernumber => $purchaseordernumber, > ); > } > >@@ -129,6 +131,7 @@ $template->param( > name => $name, > basket => $basket, > booksellerinvoicenumber => $booksellerinvoicenumber, >+ purchaseordernumber => $purchaseordernumber, > basketgroupname => $basketgroupname, > from_placed_on => $from_date, > to_placed_on => $to_date, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >index 5aebf54..d449e1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -20,6 +20,7 @@ > <p id="filters" style="display:none"> > <label for="basket">Basket: </label><input type="text" name="basket" id="basket" /> > <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >+ <label for="purchaseordernumber">Purchase order no.: </label><input type="text" name="purchaseordernumber" id="purchaseordernumber" /> > </p> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 4132edb..616dc87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -49,6 +49,10 @@ > <label for="basketgroupname">Basket group:</label> > <input type="text" name="basketgroupname" id="basketgroupname" value="[% basketgroupname %]" /> > </li> >+ <li> >+ <label for="purchaseordernumber">Purchase ordernumber:</label> >+ <input type="text" name="purchaseordernumber" id="purchaseordernumber" value="[% purchaseordernumber %]" /> >+ </li> > <li><label for="from">From: </label> > <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >@@ -71,6 +75,7 @@ > <th>Basket group</th> > <th>Invoice number</th> > <th>Order number</th> >+ <th>Purchase ordernumber</th> > <th>Summary</th> > <th>Vendor</th> > <th>Placed on</th> >@@ -97,6 +102,7 @@ > [% END %] > </td> > <td>[% suggestions_loo.ordernumber %]</td> >+ <td>[% suggestions_loo.purchaseordernumber %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a> > <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td> > <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td> >-- >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 10530
:
20284
|
20557