From 70607332a195459415b10ee78ac274d8e2eb5049 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Fri, 25 Jun 2010 10:59:36 +0200 Subject: [PATCH] (MT #3651) Fills "book fund" combobox with bugdets and fix some bugs of research by filter. Signed-off-by: Galen Charlton --- .../prog/en/modules/suggestion/suggestion.tmpl | 10 +++++----- suggestion/suggestion.pl | 14 +++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 74cc5fba6b..694002ad32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -304,20 +304,20 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
  • -
  • -
  • Acquistion information

    -
    1. - +
    2. diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 68f35be037..876c26ab4e 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -57,9 +57,13 @@ sub GetCriteriumDesc{ if ($displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; -# warn '$borr : ',Data::Dumper::Dumper($borr); - return $$borr{firstname}.", ".$$borr{surname}; - } + return $$borr{firstname} . ", " . $$borr{surname}; + } + if ( $displayby =~ /budgetid/) { + my $budget = GetBudget($criteriumvalue); + return "" unless $budget; + return $$budget{budget_name}; + } } my $input = CGI->new; @@ -265,8 +269,8 @@ foreach my $budget (@$budgets){ $template->param( budgetsloop => $budgets); -my %hashlists; -foreach my $field qw(managedby acceptedby suggestedby STATUS){ +my %hashlists; +foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) { my $values_list; $values_list=GetDistinctValues("suggestions.".$field) ; my @codes_list = map{ -- 2.39.5