[Patches] [PATCH] Bug 3184: Show creator and budget on order receive page
koha-patchbot at kohaaloha.com
koha-patchbot at kohaaloha.com
Wed Dec 21 03:10:37 NZDT 2011
From: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri, 28 Oct 2011 15:54:53 +0200
Subject: [PATCH] Bug 3184: Show creator and budget on order receive page
Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>
To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly
Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"
Signed-off-by: Duncan Tyler <duncan at catalyst.net.nz>
---
acqui/orderreceive.pl | 15 ++++++++++++---
.../prog/en/modules/acqui/orderreceive.tt | 4 +++-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 98ba544..ffebb3b 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -70,6 +70,7 @@ use C4::Auth;
use C4::Output;
use C4::Dates qw/format_date/;
use C4::Bookseller qw/ GetBookSellerFromId /;
+use C4::Budgets qw/ GetBudget /;
use C4::Members;
use C4::Branch; # GetBranches
use C4::Items;
@@ -133,6 +134,12 @@ if ( $count == 1 ) {
if ( @$results[0]->{'unitprice'} == 0 ) {
@$results[0]->{'unitprice'} = '';
}
+
+ my $authorisedby = @$results[0]->{'authorisedby'};
+ my $member = GetMember( borrowernumber => $authorisedby );
+
+ my $budget = GetBudget( @$results[0]->{'budget_id'} );
+
$template->param(
count => 1,
biblionumber => @$results[0]->{'biblionumber'},
@@ -148,17 +155,19 @@ if ( $count == 1 ) {
copyrightdate => @$results[0]->{'copyrightdate'},
isbn => @$results[0]->{'isbn'},
seriestitle => @$results[0]->{'seriestitle'},
- bookfund => @$results[0]->{'bookfundid'},
+ bookfund => $budget->{budget_name},
quantity => @$results[0]->{'quantity'},
quantityreceivedplus1 => @$results[0]->{'quantityreceived'} + 1,
quantityreceived => @$results[0]->{'quantityreceived'},
rrp => @$results[0]->{'rrp'},
ecost => @$results[0]->{'ecost'},
unitprice => @$results[0]->{'unitprice'},
+ memberfirstname => $member->{firstname} || "",
+ membersurname => $member->{surname} || "",
invoice => $invoice,
datereceived => $datereceived->output(),
- datereceived_iso => $datereceived->output('iso'),
- notes => $order->{notes}
+ datereceived_iso => $datereceived->output('iso'),
+ notes => $order->{notes}
);
}
else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index ac39141..ea422c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -89,7 +89,9 @@
<fieldset class="rows">
<legend>Accounting details</legend>
<ol>
- <li><label for="datereceived">Date received: </label><span class="label"> [% datereceived %] </span></li>
+ <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
+ <li><label for="bookfund">Budget: </label><span> [% bookfund %] </span></li>
+ <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
<li><label for="quantityto">Quantity to receive: </label><span class="label">
[% IF ( edit ) %]
<input type="text" name="quantity" value="[% quantity %]" />
--
1.7.5.4
More information about the Patches
mailing list