Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 19166: (follow-up) Shipment cost is always added to 'spent'

Browse source 
Two koha professionals agreed, also it is current behvaiour so this
patch removes a change

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2018-03-15 16:21:42 +00:00
parent 7465acb98b
commit d6006b0b99
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
C4/Budgets.pm
View file

@ -338,7 +338,7 @@ sub GetBudgetSpent {
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
@ -369,17 +369,7 @@ sub GetBudgetOrdered {
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;
my $sum = 0 + $sth->fetchrow_array;
my $adjustments = Koha::InvoiceAdjustments->search({budget_id => $budget_id, encumber_open => 1, closedate => undef},{ join => 'invoiceid' });
while ( my $adj = $adjustments->next ){

2
t/db_dependent/Budgets.t
View file

@ -472,7 +472,7 @@ ModReceiveOrder({
} );
is ( GetBudgetSpent( $fund ), 6, "total shipping cost is 6");
is ( GetBudgetOrdered( $fund ), '26', "total ordered price is 20");
is ( GetBudgetOrdered( $fund ), '20', "total ordered price is 20");
# CloneBudgetPeriod