Bugzilla – Attachment 6044 Details for
Bug 6994
'No budget defined' showing up although budgets and funds are defined
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6994: Wrong 'no budget defined' alert
Bug-6994-Wrong-no-budget-defined-alert.patch (text/plain), 2.65 KB, created by
Katrin Fischer
on 2011-10-24 19:12:06 UTC
(
hide
)
Description:
Bug 6994: Wrong 'no budget defined' alert
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-10-24 19:12:06 UTC
Size:
2.65 KB
patch
obsolete
>From 2f9bbbe2de1ecb837a8f52e33698352472863b2b Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Mon, 24 Oct 2011 20:59:57 +0200 >Subject: [PATCH] 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. >--- > acqui/neworderbiblio.pl | 18 ++++++++++++++++-- > .../en/includes/acquisitions-add-to-basket.inc | 2 +- > 2 files changed, 17 insertions(+), 3 deletions(-) > >diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl >index c348940..5824f6b 100755 >--- a/acqui/neworderbiblio.pl >+++ b/acqui/neworderbiblio.pl >@@ -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, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >index 9fe6c05..6082637 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >@@ -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> >\ No newline at end of file >+</fieldset> >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6994
:
5815
|
6044
|
6101