projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 7509: Added index on items itemcallnumber
[koha_gimpoz]
/
suggestion
/
suggestion.pl
diff --git
a/suggestion/suggestion.pl
b/suggestion/suggestion.pl
index
d00b632
..
272ca6f
100755
(executable)
--- a/
suggestion/suggestion.pl
+++ b/
suggestion/suggestion.pl
@@
-59,7
+59,7
@@
sub GetCriteriumDesc{
if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
return "" unless $borr;
if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
return "" unless $borr;
- return $$borr{
firstname} . ", " . $$borr{sur
name};
+ return $$borr{
surname} . ", " . $$borr{first
name};
}
if ( $displayby =~ /budgetid/) {
my $budget = GetBudget($criteriumvalue);
}
if ( $displayby =~ /budgetid/) {
my $budget = GetBudget($criteriumvalue);
@@
-307,13
+307,21
@@
$template->param( "statusselected_$$suggestion_ref{'STATUS'}" =>1);
# get currencies and rates
my @rates = GetCurrencies();
my $count = scalar @rates;
# get currencies and rates
my @rates = GetCurrencies();
my $count = scalar @rates;
+my $active_currency = GetCurrency();
+my $selected_currency;
+if ($$suggestion_ref{'currency'}) {
+ $selected_currency = $$suggestion_ref{'currency'};
+}
+else {
+ $selected_currency = $active_currency->{currency};
+}
my @loop_currency = ();
for ( my $i = 0 ; $i < $count ; $i++ ) {
my %line;
$line{currcode} = $rates[$i]->{'currency'};
$line{rate} = $rates[$i]->{'rate'};
my @loop_currency = ();
for ( my $i = 0 ; $i < $count ; $i++ ) {
my %line;
$line{currcode} = $rates[$i]->{'currency'};
$line{rate} = $rates[$i]->{'rate'};
- $line{selected} = 1 if ($
$suggestion_ref{'currency'} && $line{'currcode'} eq $$suggestion_ref{'currency'}
);
+ $line{selected} = 1 if ($
line{'currcode'} eq $selected_currency
);
push @loop_currency, \%line;
}
push @loop_currency, \%line;
}