From 0b9c0b752856965eba654d5affdb86c4091363a5 Mon Sep 17 00:00:00 2001 From: Katrin Fischer 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 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 Signed-off-by: Paul Poulain (cherry picked from commit 37e1f05e8f8617883c02ff1b57f36a4fff3a39ae) Signed-off-by: Chris Nighswonger --- 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 98ba544246..753071dea6 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 ac391410e2..ea422c8f72 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 @@
Accounting details
    -
  1. [% datereceived %]
  2. +
  3. [% datereceived %]
  4. +
  5. [% bookfund %]
  6. +
  7. [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]
  8. [% IF ( edit ) %] -- 2.39.5