#use warnings; FIXME - Bug 2505
use C4::Context;
use Koha::Database;
+use Koha::Patrons;
use C4::Debug;
use vars qw(@ISA @EXPORT);
# get the actual amount
$sth = $dbh->prepare( qq|
- SELECT SUM(ecost) AS actual FROM aqorders
+ SELECT SUM(ecost_tax_included) AS actual FROM aqorders
WHERE budget_id = ? AND
entrydate like "$cell->{'authvalue'}%" |
);
# get the actual amount
$sth = $dbh->prepare( qq|
- SELECT SUM(ecost) FROM aqorders
+ SELECT SUM(ecost_tax_included) FROM aqorders
LEFT JOIN aqorders_items
ON (aqorders.ordernumber = aqorders_items.ordernumber)
LEFT JOIN items
# get the actual amount
$sth = $dbh->prepare( qq|
- SELECT SUM( ecost * quantity) AS actual
+ SELECT SUM( ecost_tax_included * quantity) AS actual
FROM aqorders JOIN biblioitems
ON (biblioitems.biblionumber = aqorders.biblionumber )
WHERE aqorders.budget_id = ? and itemtype = ? |
# get the actual amount
$sth = $dbh->prepare( qq|
- SELECT SUM(ecost * quantity) AS actual
+ SELECT SUM(ecost_tax_included * quantity) AS actual
FROM aqorders
JOIN aqbudgets ON (aqbudgets.budget_id = aqorders.budget_id )
WHERE aqorders.budget_id = ? AND
# -------------------------------------------------------------------
sub GetBudgetSpent {
- my ($budget_id) = @_;
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare(qq|
- SELECT SUM( COALESCE(unitprice, ecost) * quantity ) AS sum FROM aqorders
+ my ($budget_id) = @_;
+ my $dbh = C4::Context->dbh;
+ # unitprice_tax_included should always been set here
+ # we should not need to retrieve ecost_tax_included
+ my $sth = $dbh->prepare(qq|
+ SELECT SUM( COALESCE(unitprice_tax_included, ecost_tax_included) * quantity ) AS sum FROM aqorders
WHERE budget_id = ? AND
quantityreceived > 0 AND
datecancellationprinted IS NULL
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 ($budget_id) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(qq|
- SELECT SUM(ecost * quantity) AS sum FROM aqorders
+ SELECT SUM(ecost_tax_included * quantity) AS sum FROM aqorders
WHERE budget_id = ? AND
quantityreceived = 0 AND
datecancellationprinted IS NULL
$sth->execute($budget_id);
my $sum = $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;
-
return $sum;
}
return $sth->fetchrow_array;
}
-# -------------------------------------------------------------------
+=head2 GetBudgetAuthCats
+
+ my $auth_cats = &GetBudgetAuthCats($budget_period_id);
+
+Return the list of authcat for a given budget_period_id
+
+=cut
+
sub GetBudgetAuthCats {
my ($budget_period_id) = shift;
# now, populate the auth_cats_loop used in the budget planning button
$sth->execute($budget_period_id);
my %authcats;
while (my ($sort1_authcat,$sort2_authcat) = $sth->fetchrow) {
- $authcats{$sort1_authcat}=1;
- $authcats{$sort2_authcat}=1;
- }
- my @auth_cats_loop;
- foreach (sort keys %authcats) {
- push @auth_cats_loop,{ authcat => $_ };
+ $authcats{$sort1_authcat}=1 if $sort1_authcat;
+ $authcats{$sort2_authcat}=1 if $sort2_authcat;
}
- return \@auth_cats_loop;
+ return [ sort keys %authcats ];
}
# -------------------------------------------------------------------
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) {
}
} else {
if ($branchcode) {
- push @where_strings," (budget_branchcode =? or budget_branchcode is NULL)";
+ push @where_strings," (budget_branchcode =? or budget_branchcode is NULL OR budget_branchcode='')";
push @bind_params, $branchcode;
}
}
my @sort = ();
foreach my $first_parent (@first_parents) {
- _add_budget_children(\@sort, $first_parent);
+ _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(qq|
+ 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_id');
+ my $hr_budget_ordered = $dbh->selectall_hashref(qq|
+ 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_id');
+ my $hr_budget_spent_shipment = $dbh->selectall_hashref(qq|
+ 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(qq|
+ SELECT shipmentcost_budgetid as budget_id,
+ SUM(shipmentcost) as shipmentcost
+ FROM aqinvoices
+ WHERE closedate IS NULL
+ GROUP BY shipmentcost_budgetid
+ |, 'budget_id');
+
+ my $recursiveAdd;
+ $recursiveAdd = sub {
+ my ($budget, $parent) = @_;
+
+ foreach my $child (@{$budget->{children}}){
+ $recursiveAdd->($child, $budget);
+ }
+
+ $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};
+ }
+ };
+
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 ($budget->{budget_parent_id} == undef) {
+ $recursiveAdd->($budget);
+ }
}
+
return \@sort;
}
sub _add_budget_children {
my $res = shift;
my $budget = shift;
+ $budget->{budget_level} = shift;
push @$res, $budget;
my $children = $budget->{'children'} || [];
return unless @$children; # break recursivity
foreach my $child (@$children) {
- _add_budget_children($res, $child);
+ _add_budget_children($res, $child, $budget->{budget_level} + 1);
}
}
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 );
my ($borrower, $budget, $userflags) = @_;
if (not ref $borrower) {
- $borrower = C4::Members::GetMember(borrowernumber => $borrower);
+ $borrower = Koha::Patrons->find( $borrower );
+ return 0 unless $borrower;
+ $borrower = $borrower->unblessed;
}
if (not ref $budget) {
$budget = GetBudget($budget);
my ($borrower, $budget, $userflags) = @_;
if (not ref $borrower) {
- $borrower = C4::Members::GetMember(borrowernumber => $borrower);
+ $borrower = Koha::Patrons->find( $borrower );
+ return 0 unless $borrower;
+ $borrower = $borrower->unblessed;
}
if (not ref $budget) {
$budget = GetBudget($budget);
projects / koha.git / blobdiff