gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 6994: Wrong 'no budget defined' alert 

When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.

To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.

B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 488f4be865)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Katrin Fischer 2011-10-24 20:59:57 +02:00 committed by Chris Nighswonger
parent 99147d2603
commit fe0afd3506
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
acqui/neworderbiblio.pl
View File

@ -65,6 +65,8 @@ use C4::Biblio;
use C4::Auth;
use C4::Output;
use C4::Koha;
use C4::Members qw/ GetMember /;
use C4::Budgets qw/ GetBudgetHierarchy /;
my $input = new CGI;
@ -121,10 +123,22 @@ foreach my $result ( @{$marcresults} ) {
}
my $borrower= GetMember('borrowernumber' => $loggedinuser);
my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
my $has_budgets = 0;
foreach my $r (@{$budgets}) {
if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
next;
}
$has_budgets = 1;
last;
}
$template->param(
has_budgets => $has_budgets,
basketno => $basketno,
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
resultsloop => \@results,
total => $total_hits,
query => $query,

2
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
View File

@ -15,4 +15,4 @@
[% ELSE %]
You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.
[% END %]
</fieldset>
</fieldset>