Bug 5072 - prevent creating new orders if there are no valid budgets

On the basket editing screen, the links to add orders to a basket are
hidden unless a valid fund is available.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4833fd8399)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Robin Sheat 2010-07-29 16:10:52 +12:00 committed by Chris Nighswonger
parent 1410123f6d
commit cb0862db67
3 changed files with 20 additions and 7 deletions

View File

@ -663,11 +663,11 @@ sub GetBudget {
return $result;
}
=head2 GetBudgets
=head2 GetChildBudgetsSpent
&GetBudgets($filter, $order_by);
&GetChildBudgetsSpent($budget-id);
gets all budgets
gets the total spent of the level and sublevels of $budget_id
=cut
@ -690,11 +690,11 @@ sub GetChildBudgetsSpent {
return $total_spent;
}
=head2 GetChildBudgetsSpent
=head2 GetBudgets
&GetChildBudgetsSpent($budget-id);
&GetBudgets($filter, $order_by);
gets the total spent of the level and sublevels of $budget_id
gets all budgets
=cut

View File

@ -291,6 +291,18 @@ if ( $op eq 'delete_confirm' ) {
my $contract = &GetContract($basket->{contractnumber});
my @orders = GetOrders($basketno);
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(
basketno => $basketno,
basketname => $basket->{'basketname'},
@ -321,6 +333,7 @@ if ( $op eq 'delete_confirm' ) {
basketgroups => $basketgroups,
grouped => $basket->{basketgroupid},
unclosable => @orders ? 0 : 1,
has_budgets => $has_budgets,
);
}

View File

@ -93,7 +93,7 @@ use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
my $input = new CGI;
my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR!
my $budget_id = $input->param('budget_id') || 0; # FIXME: else ERROR!
my $budget_id = $input->param('budget_id') || 0;
my $title = $input->param('title');
my $author = $input->param('author');
my $publicationyear = $input->param('publicationyear');