Bugzilla – Attachment 21232 Details for
Bug 10403
Add ability to set fund/budget on receipt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10403: Show inactive but unlocked budgets on orderreceive
Bug-10403-Show-inactive-but-unlocked-budgets-on-or.patch (text/plain), 3.19 KB, created by
Jonathan Druart
on 2013-09-19 10:40:11 UTC
(
hide
)
Description:
Bug 10403: Show inactive but unlocked budgets on orderreceive
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-09-19 10:40:11 UTC
Size:
3.19 KB
patch
obsolete
>From cad01e304e6f45f56436059ec367c8b0d814d7cf Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Tue, 13 Aug 2013 07:51:57 -0400 >Subject: [PATCH] Bug 10403: Show inactive but unlocked budgets on > orderreceive > >I have heard from several libraries that at the end of the budget >year even though a budget is inactive for new acquisitions, an >inactive budget should remain modifiable until the books are >closed and the budget is marked inactive. This patch makes it so >that all budgets that are unlocked are available on the order >receipt page (only). > >Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr> > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> >--- > acqui/orderreceive.pl | 6 +++++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 5 +++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > >diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl >index 833e402..4fb13ec 100755 >--- a/acqui/orderreceive.pl >+++ b/acqui/orderreceive.pl >@@ -228,8 +228,12 @@ $template->param( > > my $borrower = GetMember( 'borrowernumber' => $loggedinuser ); > my @budget_loop; >-my $periods = GetBudgetPeriods( { 'budget_period_active' => 1 } ); >+my $periods = GetBudgetPeriods( ); > foreach my $period (@$periods) { >+ if ($period->{'budget_period_id'} == $budget->{'budget_period_id'}) { >+ $template->{'VARS'}->{'budget_period_description'} = $period->{'budget_period_description'}; >+ } >+ next if $period->{'budget_period_locked'} || !$period->{'budget_period_description'}; > my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} ); > my @funds; > foreach my $r ( @{$budget_hierarchy} ) { >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 0ffce99..cac2132 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -266,7 +266,7 @@ > <ol> > <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li> > <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund"> >- <option value="">Keep current ([% bookfund %])</option> >+ <option value="">Keep current ([% budget_period_description %] - [% bookfund %])</option> > [% FOREACH period IN budget_loop %] > <optgroup label="[% period.description %]"> > [% FOREACH fund IN period.funds %] >@@ -277,7 +277,8 @@ > [% END %] > [% END %] > [% END %] >- </select> (Current: [% bookfund %])</li> >+ </select></li> >+ <li><label> </label><span>(Current: [% budget_period_description %] - [% bookfund %])</span></li> > <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li> > <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label"> > [% IF ( edit and not subscriptionid) %] >-- >1.7.10.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 10403
:
19050
|
20298
|
20299
|
21101
|
21102
|
21231
| 21232