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

Bug 31631: Optionally use tax-exclusive values for calculating fund values

Browse source 
Test plan:
1. Apply patches
2. sudo koha-upgrade-schema <instance>
3. Restart services
4. Set TaxRates syspref = 0.15
5. Create a new fund with amount = 1000
6. Add an order to a basket with the following values:
- Fund = Choose the fund from step #5
- Quantity = 1
- Vendor price = 10
- Tax rate = 15%
- Discount = 20%
- Retail price = 10.00
- Replacement cost = 10.00
- Actual cost = 10.00
- Ensure the basket belongs to a vendor with ("List prices" = "Don't include tax" and "Invoice prices" = "Don't include tax")
7. Go to the Acquisitions home page
8. Confirm the 'Ordered' column for the step #5 fund contains 9.20
9. Click on the 9.20 link and confirm the ordered.pl page that loads
also contains 9.20 as the 'Subtotal'

10. Change 'CalculateFundValuesIncludingTax' = 'Exclude'
11. On the Acquisitions home page confirm the 'Ordered' column now
contains 8.00
12. Click on the 8.00 link and confirm the ordered.pl page also contains
8.00 as the 'Subtotal'

13. Close your basket and receive your order - change the 'Actual costs'
= 8.00 (the $10 retail price less the 20% discount, tax exclusive)
14. Go to the Acquisitions home page and confirm the 'Spent' column now
contains 8.00
15. Click on the 8.00 link and confirm the spent.pl page also contains
8.00 as the 'Subtotal'

16. Change 'CalculateFundValuesIncludingTax' = 'Include'
17. Confirm the 'Spent' column on the Acquisitions home page now shows
9.20
18. Click on the 9.20 link and confirm the spent.pl page also contains
9.20 as the 'Subtotal'

Sponsored-by: Waikato Institute of Technology, New Zealand

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Alex Buckley 2022-09-27 16:59:00 +13:00 committed by Tomas Cohen Arazi
parent c684833b82
commit 3ca1ab63ac
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
5 changed files with 71 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
C4/Budgets.pm
View file

@ -79,6 +79,7 @@ BEGIN {
CloneBudgetPeriod
CloneBudgetHierarchy
MoveOrders
FieldsForCalculatingFundValues
);
}
@ -341,15 +342,17 @@ sub ModBudgetPlan {
sub GetBudgetSpent {
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
# Choose correct unitprice and ecost fields
my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues();
my $sth = $dbh->prepare(qq|
SELECT SUM( | . C4::Acquisition::get_rounding_sql("COALESCE(unitprice_tax_included, ecost_tax_included)") . qq| * quantity ) AS sum FROM aqorders
SELECT SUM( | . C4::Acquisition::get_rounding_sql("COALESCE($unitprice_field, $ecost_field)") . qq| * quantity ) AS sum FROM aqorders
WHERE budget_id = ? AND
quantityreceived > 0 AND
datecancellationprinted IS NULL
|);
$sth->execute($budget_id);
$sth->execute($budget_id);
my $sum = ( $sth->fetchrow_array || 0 ) + 0;
$sth = $dbh->prepare(qq|
@ -367,20 +370,24 @@ sub GetBudgetSpent {
$sum += $adj->adjustment;
}
return $sum;
return $sum;
}
# -------------------------------------------------------------------
sub GetBudgetOrdered {
my ($budget_id) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(qq|
SELECT SUM(| . C4::Acquisition::get_rounding_sql(qq|ecost_tax_included|) . qq| * quantity) AS sum FROM aqorders
my ($budget_id) = @_;
my $dbh = C4::Context->dbh;
# Get correct unitprice and ecost prices as possible
my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues();
my $sth = $dbh->prepare(qq|
SELECT SUM(| . C4::Acquisition::get_rounding_sql(qq|$ecost_field|) . qq| * quantity) AS sum FROM aqorders
WHERE budget_id = ? AND
quantityreceived = 0 AND
datecancellationprinted IS NULL
|);
$sth->execute($budget_id);
$sth->execute($budget_id);
my $sum = ( $sth->fetchrow_array || 0 ) + 0;
my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({budget_id => $budget_id, encumber_open => 1, closedate => undef},{ join => 'invoiceid' });
@ -388,7 +395,7 @@ sub GetBudgetOrdered {
$sum += $adj->adjustment;
}
return $sum;
return $sum;
}
=head2 GetBudgetName
@ -550,18 +557,22 @@ sub GetBudgetHierarchy {
foreach my $first_parent (@first_parents) {
_add_budget_children(\@sort, $first_parent, 0);
}
# Get correct unitprice and ecost prices as possible
my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues();
if (!$skiptotals) {
# 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( | . C4::Acquisition::get_rounding_sql(qq|COALESCE(unitprice_tax_included, ecost_tax_included)|) . q| * quantity ) AS budget_spent
SUM( | . C4::Acquisition::get_rounding_sql(qq|COALESCE($unitprice_field, $ecost_field)|) . q| * 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( | . C4::Acquisition::get_rounding_sql(qq|ecost_tax_included|) . q| * quantity) AS budget_ordered
SUM( | . C4::Acquisition::get_rounding_sql(qq|$ecost_field|) . q| * 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
@ -1399,6 +1410,29 @@ sub MoveOrders {
return \@report;
}
=head2 FieldsForCalculatingFundValues
my ( $unitprice_field, $ecost_field ) = FieldsForCalculatingFundValues();
Fetch the tax inclusive or tax exclusive database fields for calculating fund values based
on the value of the CalculateFundValuesIncludingTax system preference.
=cut
sub FieldsForCalculatingFundValues {
# Choose correct unitprice and ecost fields
my $unitprice_field = 'unitprice_tax_included';
my $ecost_field = 'ecost_tax_included';
if ( !C4::Context->preference('CalculateFundValuesIncludingTax') ) {
$unitprice_field = 'unitprice_tax_excluded';
$ecost_field = 'ecost_tax_excluded';
}
return ( $unitprice_field, $ecost_field);
}
END { } # module clean-up code here (global destructor)
1;

9
acqui/ordered.pl
View file

@ -49,11 +49,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
# Choose correct ecost field
my ( $unitprice_field, $ecost_field ) = C4::Budgets->FieldsForCalculatingFundValues();
my $query = <<EOQ;
SELECT
aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
quantity-quantityreceived AS tleft,
ecost_tax_included, budgetdate, entrydate,
$ecost_field, budgetdate, entrydate,
aqbasket.booksellerid,
aqbooksellers.name as vendorname,
GROUP_CONCAT(DISTINCT itype SEPARATOR '|') AS itypes,
@ -74,7 +77,7 @@ WHERE
(quantity > quantityreceived OR quantityreceived IS NULL)
GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
tleft,
ecost_tax_included, budgetdate, entrydate,
$ecost_field, budgetdate, entrydate,
aqbasket.booksellerid,
aqbooksellers.name,
title
@ -96,7 +99,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
$left = $data->{'quantity'};
}
if ( $left && $left > 0 ) {
my $subtotal = $left * get_rounded_price( $data->{'ecost_tax_included'} );
my $subtotal = $left * get_rounded_price( $data->{$ecost_field} );
$data->{subtotal} = sprintf( "%.2f", $subtotal );
$data->{'left'} = $left;
push @ordered, $data;

13
acqui/spent.pl
View file

@ -21,7 +21,7 @@
=head1 NAME
spent.pl
acqui/spent.pl
=head1 DESCRIPTION
@ -51,6 +51,9 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
# Get correct unitprice field
my ( $unitprice_field ) = C4::Budgets->FieldsForCalculatingFundValues();
my $query = <<EOQ;
SELECT
aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber,
@ -62,7 +65,7 @@ SELECT
aqorders.invoiceid,
aqinvoices.invoicenumber,
quantityreceived,
unitprice_tax_included,
$unitprice_field,
datereceived,
aqbooksellers.name as vendorname
FROM (aqorders, aqbasket)
@ -89,7 +92,7 @@ WHERE
aqorders.invoiceid,
aqinvoices.invoicenumber,
quantityreceived,
unitprice_tax_included,
$unitprice_field,
datereceived,
aqbooksellers.name
@ -105,9 +108,9 @@ while ( my $data = $sth->fetchrow_hashref ) {
my $recv = $data->{'quantityreceived'};
$data->{'itemtypes'} = [split('\|', $data->{itypes})];
if ( $recv > 0 ) {
my $rowtotal = $recv * get_rounded_price($data->{'unitprice_tax_included'});
my $rowtotal = $recv * get_rounded_price($data->{$unitprice_field});
$data->{'rowtotal'} = sprintf( "%.2f", $rowtotal );
$data->{'unitprice_tax_included'} = sprintf( "%.2f", $data->{'unitprice_tax_included'} );
$data->{'unitprice_tax_included'} = sprintf( "%.2f", $data->{$unitprice_field} );
$subtotal += $rowtotal;
push @spent, $data;
}

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
View file

@ -79,7 +79,11 @@
[% order.left | html %]
</td>
<td class="data cell">
[% order.ecost_tax_included | $Price %]
[% IF Koha.Preference('CalculateFundValuesIncludingTax') %]
[% order.ecost_tax_included | $Price %]
[% ELSE %]
[% order.ecost_tax_excluded | $Price %]
[% END %]
</td>
<td class="cell" data-order="[% order.entrydate | html %]">
[% order.entrydate | $KohaDates %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
View file

@ -81,7 +81,11 @@
[% order.quantityreceived | html %]
</td>
<td class="cell">
[% order.unitprice_tax_included | $Price %]
[% IF Koha.Preference('CalculateFundValuesIncludingTax') %]
[% order.unitprice_tax_included | $Price %]
[% ELSE %]
[% order.unitprice_tax_excluded | $Price %]
[% END %]
</td>
<td class="cell" data-order="[% order.entrydate | html %]">
[% order.entrydate | $KohaDates %]