Bugzilla – Attachment 23728 Details for
Bug 11170
The pending order list should only display orders to receive
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11170: The pending order list should only display orders to receive
Bug-11170-The-pending-order-list-should-only-displ.patch (text/plain), 2.49 KB, created by
Kyle M Hall
on 2013-12-20 18:03:24 UTC
(
hide
)
Description:
Bug 11170: The pending order list should only display orders to receive
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2013-12-20 18:03:24 UTC
Size:
2.49 KB
patch
obsolete
>From 2a23c271cd37c536d490621210d008920803a4a6 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 30 Oct 2013 15:34:15 +0100 >Subject: [PATCH] Bug 11170: The pending order list should only display orders to receive > >The order status ordered is set when the basket is closed. >The parcel page should only display status "ordered" and "partial". > >Test plan: >- create a basket. >- create an order. >- verify the order is not listed on the parcel page (i.e. you cannot > receive it). >- close the basket. >- verify the order is listed on the parcel page. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Acquisition.pm | 12 +++++++++--- > acqui/parcel.pl | 3 ++- > 2 files changed, 11 insertions(+), 4 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 1bf41cb..05b7f48 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -1665,6 +1665,7 @@ sub SearchOrders { > my $basketgroupname = $params->{basketgroupname}; > my $owner = $params->{owner}; > my $pending = $params->{pending}; >+ my $ordered = $params->{ordered}; > > my $dbh = C4::Context->dbh; > my @args = (); >@@ -1690,9 +1691,14 @@ sub SearchOrders { > WHERE (datecancellationprinted is NULL) > }; > >- $query .= q{ >- AND (quantity > quantityreceived OR quantityreceived is NULL) >- } if $pending; >+ if ( $pending ) { >+ $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)}; >+ } >+ if ( $ordered ) { >+ $query .= q{ AND (quantity > quantityreceived OR quantityreceived is NULL)} >+ unless $pending; >+ $query .= q{ AND aqorders.orderstatus IN ( "ordered", "partial" )}; >+ } > > my $userenv = C4::Context->userenv; > if ( C4::Context->preference("IndependentBranches") ) { >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index ad0e51d..352e152 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -228,6 +228,7 @@ unless( defined $invoice->{closedate} ) { > ean => $ean, > basketgroupname => $basketgroupname, > pending => 1, >+ ordered => 1, > }); > $template->param( > summaryfilter => $search, >@@ -239,7 +240,7 @@ unless( defined $invoice->{closedate} ) { > }else{ > $pendingorders = SearchOrders({ > booksellerid => $booksellerid, >- pending => 1 >+ ordered => 1 > }); > } > my $countpendings = scalar @$pendingorders; >-- >1.7.2.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 11170
:
22597
|
23571
|
23572
| 23728 |
23729
|
26049