Bugzilla – Attachment 3184 Details for
Bug 4438
incorrect "Budget total exceeds period allocation" error when editing fund
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
followup proposed
0001-bug4438-MT5496-budget-Exceeds-total-allocation.patch (text/plain), 2.14 KB, created by
dev_patches
on 2011-02-18 22:43:12 UTC
(
hide
)
Description:
followup proposed
Filename:
MIME Type:
Creator:
dev_patches
Created:
2011-02-18 22:43:12 UTC
Size:
2.14 KB
patch
obsolete
>From 50011b597a7acba30103b531ad69c74b7687a3f1 Mon Sep 17 00:00:00 2001 >From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com> >Date: Fri, 18 Feb 2011 23:40:26 +0100 >Subject: [REPLACE] bug4438/MT5496 budget Exceeds total allocation > >This is a followup : >When editing a budget, the check for the total allocation would take into account the budget itself. >Showing an improper error message >The problem was solved when adding a child budget but not when editing the same budget. >--- > admin/check_parent_total.pl | 20 ++++++++++++++++---- > 1 files changed, 16 insertions(+), 4 deletions(-) > >diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl >index d5b784d..f0f8c9b 100755 >--- a/admin/check_parent_total.pl >+++ b/admin/check_parent_total.pl >@@ -62,7 +62,13 @@ my ($sub_unalloc , $period_sum, $budget_period_unalloc); > if ($parent) { > my $query = " SELECT SUM(budget_amount) as sum FROM aqbudgets where budget_parent_id = ? "; > my $sth = $dbh->prepare($query); >- $sth->execute( $parent->{'budget_id'} ); >+ my @sql_params; >+ push @sql_params, $parent->{'budget_id'} ; >+ if ($budget_id){ >+ $query.=qq| and budget_id <> ? |; >+ push @sql_params,$budget_id; >+ } >+ $sth->execute( @sql_params ); > my $sum = $sth->fetchrow_hashref; > $sth->finish; > >@@ -75,10 +81,16 @@ if ($parent) { > # ELSE , IF NO PARENT PASSED, THEN CHECK UNALLOCATED FOR PERIOD, IF NOT THEN RETURN 2 > else { > my $query = qq| SELECT SUM(budget_amount) as sum >- FROM aqbudgets WHERE budget_period_id = ? and budget_parent_id IS NULL|; >+ FROM aqbudgets WHERE budget_period_id = ? and budget_parent_id IS NULL |; >+ my @sql_params; >+ push @sql_params, $period_id; >+ if ($budget_id){ >+ $query.=qq| and budget_id <> ? |; >+ push @sql_params,$budget_id; >+ } > >- my $sth = $dbh->prepare($query); >- $sth->execute( $period_id ); >+ my $sth = $dbh->prepare($query); >+ $sth->execute(@sql_params); > $period_sum = $sth->fetchrow_hashref; > $sth->finish; > $budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'} if $period->{'budget_period_total'}; >-- >1.7.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 4438
:
2981
|
2982
|
2983
| 3184