Bugzilla – Attachment 25532 Details for
Bug 11471
Basket groups display 0 0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11471: Display the currency for baskets in a basketgroup
Bug-11471-Display-the-currency-for-baskets-in-a-ba.patch (text/plain), 3.28 KB, created by
Kyle M Hall (khall)
on 2014-02-21 13:45:17 UTC
(
hide
)
Description:
Bug 11471: Display the currency for baskets in a basketgroup
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-02-21 13:45:17 UTC
Size:
3.28 KB
patch
obsolete
>From a1de150d48a82046133157d026f2c2a0d203168e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 18 Feb 2014 15:07:38 +0100 >Subject: [PATCH] Bug 11471: Display the currency for baskets in a basketgroup > >On editing a basketgroup, the currency for baskets in a basketgroup is >always '0'. > >With this patch, the currency is correctly displayed. > >TEST PLAN >========= > 1) Log into staff client > 2) Acquisitions > 3) Click 'Search' in the 'Manage orders' box > 4) Click '+ New basket' because a vendor name > 5) Type 'Test Basket' into basket name > 6) Click 'Save' > 7) Click 'Add to basket' > 8) Click 'From an external source' > 9) Type 'Green Eggs and Ham' into the Title text box >10) Click 'Search' >11) Click 'Order' on any one of the results >12) Click 'Add Item' in the 'Item' box >13) Select a Fund from the dropdown in the > 'Accounting details' box >14) Click 'Save' >15) Click 'Close the basket' >16) Click 'Yes, close (Y)' without checking attach to a > basket group >17) Click the 'Basket groups' tab >18) Click '+ New basket group' >19) Notice the listing in the 'Ungrouped baskets'. >20) Drag and drop the entry into the 'Baskets in this group' > text area >21) Click 'Save' >22) Click 'Edit' >23) Notice it displays incorrectly. (e.g. Total: 0 0) >24) Apply the patch (git bz apply 11471) >25) Refresh the page >26) Notice it displays the currency correctly. (e.g. Total: 0 USD) > NOTE: If there is a space issue, see Bug 9654. > This can be applied separately from that bug. >27) Run the Koha QA Tool: (~/qa-test-tools/koha-qa.pl -v 2 -c 1) > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > acqui/basketgroup.pl | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl >index 2051eaa..c050967 100755 >--- a/acqui/basketgroup.pl >+++ b/acqui/basketgroup.pl >@@ -250,6 +250,7 @@ if ( $op eq "add" ) { > # else, edit (if it is open) or display (if it is close) the basketgroup basketgroupid > # the template will know if basketgroup must be displayed or edited, depending on the value of closed key > # >+ my $bookseller = &GetBookSellerFromId($booksellerid); > if(! $booksellerid){ > # Unknown bookseller > # FIXME : ungroupedlist does not seem to be used in this file nor in template >@@ -277,8 +278,8 @@ if ( $op eq "add" ) { > if ( $basketgroupid ) { > # Get the selected baskets in the basketgroup to display them > my $selecteds = GetBasketsByBasketgroup($basketgroupid); >- foreach (@{$selecteds}){ >- $_->{total} = BasketTotal($_->{basketno}, $_); >+ foreach my $basket(@{$selecteds}){ >+ $basket->{total} = BasketTotal($basket->{basketno}, $bookseller); > } > $template->param(basketgroupid => $basketgroupid, > selectedbaskets => $selecteds); >@@ -311,7 +312,6 @@ if ( $op eq "add" ) { > # the template will display a unique basketgroup > $template->param(grouping => 1); > my $basketgroups = &GetBasketgroups($booksellerid); >- my $bookseller = &GetBookSellerFromId($booksellerid); > my $baskets = &GetBasketsByBookseller($booksellerid); > displaybasketgroups($basketgroups, $bookseller, $baskets); > } elsif ($op eq 'mod_basket') { >-- >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 11471
:
23897
|
23898
|
25352
|
25372
|
25388
| 25532