Bugfix: [1/3] overdue_notices.pl does not process all advertised fields

[srvgit] / C4 / Budgets.pm

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 8ef85ed..8d0a2f0 100644 (file)
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -39,6 +39,7 @@ BEGIN {
         &ModBudget
         &DelBudget
         &GetBudgetSpent
+        &GetBudgetOrdered
         &GetPeriodsCount
 
            &GetBudgetPeriod
@@ -300,9 +301,26 @@ sub GetBudgetSpent {
        my ($budget_id) = @_;
        my $dbh = C4::Context->dbh;
        my $sth = $dbh->prepare(qq|
-        SELECT SUM(ecost *  quantity  ) AS sum FROM aqorders
+        SELECT SUM(ecost *  quantity) AS sum FROM aqorders
             WHERE budget_id = ? AND
-            datecancellationprinted IS NULL 
+            quantityreceived > 0 AND
+            datecancellationprinted IS NULL
+    |);
+
+       $sth->execute($budget_id);
+       my $sum =  $sth->fetchrow_array;
+       return $sum;
+}
+
+# -------------------------------------------------------------------
+sub GetBudgetOrdered {
+       my ($budget_id) = @_;
+       my $dbh = C4::Context->dbh;
+       my $sth = $dbh->prepare(qq|
+        SELECT SUM(ecost *  quantity) AS sum FROM aqorders
+            WHERE budget_id = ? AND
+            quantityreceived = 0 AND
+            datecancellationprinted IS NULL
     |);
 
        $sth->execute($budget_id);
@@ -612,14 +630,14 @@ sub DelBudget {
        return $rc;
 }
 
-=back
-
 =head2 FUNCTIONS ABOUT BUDGETS
 
 =over 2
 
 =cut
 
+=back
+
 =head3 GetBudget
 
 =over 4
@@ -755,9 +773,12 @@ sub ConvertCurrency {
     return ( $price / $cur );
 }
 
-=item
+=head3 _columns
+
        returns an array containing fieldname followed by PRI as value if PRIMARY Key
+
 =cut
+
 sub _columns(;$) {
        my $tablename=shift||"aqbudgets";
     return @{C4::Context->dbh->selectcol_arrayref("SHOW columns from $tablename",{Columns=>[1,4]})};
@@ -788,8 +809,6 @@ END { }    # module clean-up code here (global destructor)
 1;
 __END__
 
-=back
-
 =head1 AUTHOR
 
 Koha Developement team <info@koha.org>