Bugzilla – Attachment 4819 Details for
Bug 5072
Filling an order page with no budget defined causes a 500 error
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch (passed QA)
0002-Bug-5072-prevent-creating-new-orders-if-there-are-no.patch (text/plain), 2.96 KB, created by
Paul Poulain
on 2011-08-03 12:08:33 UTC
(
hide
)
Description:
proposed patch (passed QA)
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-08-03 12:08:33 UTC
Size:
2.96 KB
patch
obsolete
>From cc177802202e728b4df6c6d0cf9bfbb193fd4a7c Mon Sep 17 00:00:00 2001 >From: Robin Sheat <robin@catalyst.net.nz> >Date: Thu, 29 Jul 2010 16:10:52 +1200 >Subject: [PATCH 2/2] 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> >--- > C4/Budgets.pm | 12 ++++++------ > acqui/basket.pl | 13 +++++++++++++ > acqui/neworderempty.pl | 2 +- > 3 files changed, 20 insertions(+), 7 deletions(-) > >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index d516a12..98e5d63 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -666,11 +666,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 > >@@ -693,11 +693,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 > >diff --git a/acqui/basket.pl b/acqui/basket.pl >index 0261e86..fbe16cb 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -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, > ); > } > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index db3e852..c7d6083 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -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'); >-- >1.7.4.1 >
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 5072
:
2433
|
4802
|
4803
|
4804
|
4805
|
4818
| 4819