use C4::Context;
use Koha::Database;
use Koha::Patrons;
+use Koha::Acquisition::Invoice::Adjustments;
use C4::Debug;
use vars qw(@ISA @EXPORT);
my ($budgetperiod) = @_;
return unless($budgetperiod->{budget_period_startdate} && $budgetperiod->{budget_period_enddate});
+ undef $budgetperiod->{budget_period_id};
my $resultset = Koha::Database->new()->schema->resultset('Aqbudgetperiod');
return $resultset->create($budgetperiod)->id;
}
datecancellationprinted IS NULL
|);
$sth->execute($budget_id);
- my $sum = $sth->fetchrow_array;
+ my $sum = 0 + $sth->fetchrow_array;
$sth = $dbh->prepare(qq|
SELECT SUM(shipmentcost) AS sum
FROM aqinvoices
WHERE shipmentcost_budgetid = ?
- AND closedate IS NOT NULL
|);
+
$sth->execute($budget_id);
my ($shipmentcost_sum) = $sth->fetchrow_array;
$sum += $shipmentcost_sum;
+ my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $budget_id, closedate => { '!=' => undef } },{ join => 'invoiceid' });
+ while ( my $adj = $adjustments->next ){
+ $sum += $adj->adjustment;
+ }
+
return $sum;
}
datecancellationprinted IS NULL
|);
$sth->execute($budget_id);
- my $sum = $sth->fetchrow_array;
+ my $sum = 0 + $sth->fetchrow_array;
- $sth = $dbh->prepare(qq|
- SELECT SUM(shipmentcost) AS sum
- FROM aqinvoices
- WHERE shipmentcost_budgetid = ?
- AND closedate IS NULL
- |);
- $sth->execute($budget_id);
- my ($shipmentcost_sum) = $sth->fetchrow_array;
- $sum += $shipmentcost_sum;
+ my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $budget_id, encumber_open => 1, closedate => undef},{ join => 'invoiceid' });
+ while ( my $adj = $adjustments->next ){
+ $sum += $adj->adjustment;
+ }
return $sum;
}
my @bind_params;
my $dbh = C4::Context->dbh;
my $query = qq|
- SELECT aqbudgets.*, aqbudgetperiods.budget_period_active, aqbudgetperiods.budget_period_description
+ SELECT aqbudgets.*, aqbudgetperiods.budget_period_active, aqbudgetperiods.budget_period_description,
+ b.firstname as budget_owner_firstname, b.surname as budget_owner_surname, b.borrowernumber as budget_owner_borrowernumber
FROM aqbudgets
+ LEFT JOIN borrowers b on b.borrowernumber = aqbudgets.budget_owner_id
JOIN aqbudgetperiods USING (budget_period_id)|;
-
+
my @where_strings;
# show only period X if requested
if ($budget_period_id) {
_add_budget_children(\@sort, $first_parent, 0);
}
+ # Get all the budgets totals in as few queries as possible
+ my $hr_budget_spent = $dbh->selectall_hashref(q|
+ SELECT aqorders.budget_id, aqbudgets.budget_parent_id,
+ SUM( COALESCE(unitprice_tax_included, ecost_tax_included) * quantity ) AS budget_spent
+ FROM aqorders JOIN aqbudgets USING (budget_id)
+ WHERE quantityreceived > 0 AND datecancellationprinted IS NULL
+ GROUP BY budget_id, budget_parent_id
+ |, 'budget_id');
+ my $hr_budget_ordered = $dbh->selectall_hashref(q|
+ SELECT aqorders.budget_id, aqbudgets.budget_parent_id,
+ SUM(ecost_tax_included * quantity) AS budget_ordered
+ FROM aqorders JOIN aqbudgets USING (budget_id)
+ WHERE quantityreceived = 0 AND datecancellationprinted IS NULL
+ GROUP BY budget_id, budget_parent_id
+ |, 'budget_id');
+ my $hr_budget_spent_shipment = $dbh->selectall_hashref(q|
+ SELECT shipmentcost_budgetid as budget_id,
+ SUM(shipmentcost) as shipmentcost
+ FROM aqinvoices
+ WHERE closedate IS NOT NULL
+ GROUP BY shipmentcost_budgetid
+ |, 'budget_id');
+ my $hr_budget_ordered_shipment = $dbh->selectall_hashref(q|
+ SELECT shipmentcost_budgetid as budget_id,
+ SUM(shipmentcost) as shipmentcost
+ FROM aqinvoices
+ WHERE closedate IS NULL
+ GROUP BY shipmentcost_budgetid
+ |, 'budget_id');
+
+
foreach my $budget (@sort) {
- $budget->{budget_spent} = GetBudgetSpent( $budget->{budget_id} );
- $budget->{budget_ordered} = GetBudgetOrdered( $budget->{budget_id} );
- $budget->{total_spent} = GetBudgetHierarchySpent( $budget->{budget_id} );
- $budget->{total_ordered} = GetBudgetHierarchyOrdered( $budget->{budget_id} );
+ if ( not defined $budget->{budget_parent_id} ) {
+ _recursiveAdd( $budget, undef, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment );
+ }
}
return \@sort;
}
+sub _recursiveAdd {
+ my ($budget, $parent, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment ) = @_;
+
+ foreach my $child (@{$budget->{children}}){
+ _recursiveAdd($child, $budget, $hr_budget_spent, $hr_budget_spent_shipment, $hr_budget_ordered, $hr_budget_ordered_shipment );
+ }
+
+ $budget->{budget_spent} += $hr_budget_spent->{$budget->{budget_id}}->{budget_spent};
+ $budget->{budget_spent} += $hr_budget_spent_shipment->{$budget->{budget_id}}->{shipmentcost};
+ $budget->{budget_ordered} += $hr_budget_ordered->{$budget->{budget_id}}->{budget_ordered};
+ $budget->{budget_ordered} += $hr_budget_ordered_shipment->{$budget->{budget_id}}->{shipmentcost};
+
+ $budget->{total_spent} += $budget->{budget_spent};
+ $budget->{total_ordered} += $budget->{budget_ordered};
+
+ if ($parent) {
+ $parent->{total_spent} += $budget->{total_spent};
+ $parent->{total_ordered} += $budget->{total_ordered};
+ }
+}
+
# Recursive method to add a budget and its chidren to an array
sub _add_budget_children {
my $res = shift;
my ($budget) = @_;
return unless ($budget);
+ undef $budget->{budget_encumb} if $budget->{budget_encumb} eq '';
+ undef $budget->{budget_owner_id} if $budget->{budget_owner_id} eq '';
my $resultset = Koha::Database->new()->schema->resultset('Aqbudget');
return $resultset->create($budget)->id;
}
my $result = Koha::Database->new()->schema->resultset('Aqbudget')->find($budget);
return unless($result);
+ undef $budget->{budget_encumb} if $budget->{budget_encumb} eq '';
+ undef $budget->{budget_owner_id} if $budget->{budget_owner_id} eq '';
$result = $result->update($budget);
return $result->in_storage;
}
my $dbh = C4::Context->dbh;
my $query = qq{
- SELECT *
+ SELECT aqbudgets.*
FROM aqbudgets
+ JOIN aqbudgetperiods USING (budget_period_id)
WHERE budget_code = ?
- ORDER BY budget_id DESC
+ ORDER BY budget_period_active DESC, budget_id DESC
LIMIT 1
};
my $sth = $dbh->prepare( $query );
if (not ref $borrower) {
$borrower = Koha::Patrons->find( $borrower );
- if ( $borrower ) {
- $borrower = $borrower->unblessed;
- } else {
- return 0;
- }
+ return 0 unless $borrower;
+ $borrower = $borrower->unblessed;
}
if (not ref $budget) {
$budget = GetBudget($budget);
if (not ref $borrower) {
$borrower = Koha::Patrons->find( $borrower );
- if ( $borrower ) {
- $borrower = $borrower->unblessed;
- } else {
- return 0;
- }
+ return 0 unless $borrower;
+ $borrower = $borrower->unblessed;
}
if (not ref $budget) {
$budget = GetBudget($budget);
my $tidy_budget =
{ map { join( ' ', @columns ) =~ /$_/ ? ( $_ => $budget->{$_} ) : () }
keys %$budget };
+ delete $tidy_budget->{timestamp};
my $new_budget_id = AddBudget(
{
%$tidy_budget,
projects / koha.git / blobdiff