b760eb4725
and split the subroutine into 2 smaller subroutines (one for ordering, the other for receiving) Test plan: 1. Create a vendor and an acquisition basket 2. In this basket, create new orders using all the different methods (from an existing record, from a suggestion, from a new record, ...) then close the basket and receive these orders. Make sure it works the same with and without the patch 3. Run tests in t/Prices.t, t/db_dependent/Acquisition/populate_order_with_prices.t, and t/db_dependent/Budgets.t Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
509 lines
16 KiB
Perl
Executable file
509 lines
16 KiB
Perl
Executable file
use Modern::Perl;
|
|
use Test::More;
|
|
use Test::MockModule;
|
|
|
|
use t::lib::Mocks;
|
|
|
|
use Module::Load::Conditional qw/check_install/;
|
|
|
|
BEGIN {
|
|
if ( check_install( module => 'Test::DBIx::Class' ) ) {
|
|
plan tests => 15;
|
|
} else {
|
|
plan skip_all => "Need Test::DBIx::Class"
|
|
}
|
|
}
|
|
|
|
use_ok('C4::Context');
|
|
use_ok('Koha::Number::Price');
|
|
|
|
t::lib::Mocks::mock_preference( 'TaxRates', '0.02|0.05|0.196' );
|
|
|
|
use Test::DBIx::Class;
|
|
|
|
my $db = Test::MockModule->new('Koha::Database');
|
|
$db->mock( _new_schema => sub { return Schema(); } );
|
|
Koha::Database::flush_schema_cache();
|
|
|
|
fixtures_ok [
|
|
Currency => [
|
|
[ qw/ currency symbol rate active / ],
|
|
[ 'my_cur', '€', 1, 1, ],
|
|
],
|
|
Aqbookseller => [
|
|
[ qw/ id name listincgst invoiceincgst / ],
|
|
[ 1, '0 0', 0, 0 ],
|
|
[ 2, '0 1', 0, 1 ],
|
|
[ 3, '1 0', 1, 0 ],
|
|
[ 4, '1 1', 1, 1 ],
|
|
],
|
|
Aqbasket => [
|
|
[ qw/ basketno basketname booksellerid / ],
|
|
[ 1, '0 0', 1 ],
|
|
[ 2, '0 1', 2 ],
|
|
[ 3, '1 0', 3 ],
|
|
[ 4, '1 1', 4 ],
|
|
],
|
|
], 'add currency fixtures';
|
|
|
|
my $bookseller_module = Test::MockModule->new('Koha::Acquisition::Bookseller');
|
|
|
|
my ( $basketno_0_0, $basketno_0_1, $basketno_1_0, $basketno_1_1 ) = (1, 2, 3, 4);
|
|
my ( $invoiceid_0_0, $invoiceid_1_1 );
|
|
my $today;
|
|
|
|
for my $currency_format ( qw( US FR ) ) {
|
|
t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format );
|
|
subtest 'Configuration 1: 0 0 (Vendor List prices do not include tax / Invoice prices do not include tax)' => sub {
|
|
plan tests => 8;
|
|
|
|
my $biblionumber_0_0 = 42;
|
|
|
|
my $order_0_0 = Koha::Acquisition::Order->new({
|
|
biblionumber => $biblionumber_0_0,
|
|
quantity => 2,
|
|
listprice => 82,
|
|
unitprice => 73.80,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_0_0,
|
|
invoiceid => $invoiceid_0_0,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate_on_ordering => 0.0500,
|
|
tax_rate_on_receiving => 0.0500,
|
|
discount => 10,
|
|
datereceived => $today
|
|
});
|
|
$order_0_0->populate_with_prices_for_ordering();
|
|
|
|
compare(
|
|
{
|
|
got => $order_0_0->rrp_tax_included,
|
|
expected => 86.10,
|
|
conf => '0 0',
|
|
field => 'rrp_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->rrp_tax_excluded,
|
|
expected => 82.00,
|
|
conf => '0 0',
|
|
field => 'rrp_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->ecost_tax_included,
|
|
expected => 77.49,
|
|
conf => '0 0',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->ecost_tax_excluded,
|
|
expected => 73.80,
|
|
conf => '0 0',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->tax_value_on_ordering,
|
|
expected => 7.38,
|
|
conf => '0 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
|
|
$order_0_0->populate_with_prices_for_receiving();
|
|
|
|
compare(
|
|
{
|
|
got => $order_0_0->unitprice_tax_included,
|
|
expected => 77.49,
|
|
conf => '0 0',
|
|
field => 'unitprice_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->unitprice_tax_excluded,
|
|
expected => 73.80,
|
|
conf => '0 0',
|
|
field => 'unitprice_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->tax_value_on_receiving,
|
|
expected => 7.38,
|
|
conf => '0 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 1 1 (Vendor List prices do include tax / Invoice prices include tax)' => sub {
|
|
plan tests => 11;
|
|
|
|
my $biblionumber_1_1 = 43;
|
|
my $order_1_1 = Koha::Acquisition::Order->new({
|
|
biblionumber => $biblionumber_1_1,
|
|
quantity => 2,
|
|
listprice => 82,
|
|
unitprice => 73.80,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_1_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate_on_ordering => 0.0500,
|
|
tax_rate_on_receiving => 0.0500,
|
|
discount => 10,
|
|
datereceived => $today
|
|
});
|
|
|
|
$order_1_1->populate_with_prices_for_ordering();
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_1->rrp_tax_included,
|
|
expected => 82.00,
|
|
conf => '1 1',
|
|
field => 'rrp_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->rrp_tax_excluded,
|
|
expected => 78.10,
|
|
conf => '1 1',
|
|
field => 'rrp_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->ecost_tax_included,
|
|
expected => 73.80,
|
|
conf => '1 1',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->ecost_tax_excluded,
|
|
expected => 70.29,
|
|
conf => '1 1',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->tax_value_on_ordering,
|
|
expected => 7.03,
|
|
conf => '1 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
|
|
$order_1_1->populate_with_prices_for_receiving();
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_1->unitprice_tax_included,
|
|
expected => 73.80,
|
|
conf => '1 1',
|
|
field => 'unitprice_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->unitprice_tax_excluded,
|
|
expected => 70.29,
|
|
conf => '1 1',
|
|
field => 'unitprice_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->tax_value_on_receiving,
|
|
expected => 7.03,
|
|
conf => '1 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
|
|
# When unitprice is 0.00
|
|
# Koha::Acquisition::Order::populate_with_prices_for_ordering() falls
|
|
# back to using ecost_tax_included and ecost_tax_excluded
|
|
$order_1_1 = Koha::Acquisition::Order->new({
|
|
biblionumber => $biblionumber_1_1,
|
|
quantity => 1,
|
|
listprice => 10,
|
|
unitprice => '0.00',
|
|
quantityreceived => 1,
|
|
basketno => $basketno_1_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 10.00,
|
|
ecost => 10.00,
|
|
tax_rate_on_ordering => 0.1500,
|
|
tax_rate_on_receiving => 0.1500,
|
|
discount => 0,
|
|
datereceived => $today
|
|
});
|
|
|
|
$order_1_1->populate_with_prices_for_ordering();
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_1->ecost_tax_included,
|
|
expected => 10.00,
|
|
conf => '1 1',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->ecost_tax_excluded,
|
|
expected => 8.70,
|
|
conf => '1 1',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->tax_value_on_ordering,
|
|
expected => 1.30,
|
|
conf => '1 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 1 0 (Vendor List prices include tax / Invoice prices do not include tax)' => sub {
|
|
plan tests => 9;
|
|
|
|
my $biblionumber_1_0 = 44;
|
|
my $order_1_0 = Koha::Acquisition::Order->new({
|
|
biblionumber => $biblionumber_1_0,
|
|
quantity => 2,
|
|
listprice => 82,
|
|
unitprice => 0,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_1_0,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate_on_ordering => 0.0500,
|
|
tax_rate_on_receiving => 0.0500,
|
|
discount => 10,
|
|
datereceived => $today
|
|
});
|
|
|
|
$order_1_0->populate_with_prices_for_ordering();
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_0->rrp_tax_included,
|
|
expected => 82,
|
|
conf => '1 0',
|
|
field => 'rrp_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->rrp_tax_excluded,
|
|
expected => 78.10,
|
|
conf => '1 0',
|
|
field => 'rrp_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->ecost_tax_included,
|
|
expected => 73.80,
|
|
conf => '1 0',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->ecost_tax_excluded,
|
|
expected => 70.29,
|
|
conf => '1 0',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
# If we order with unitprice = 0, tax is calculated from the ecost
|
|
# (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost
|
|
compare(
|
|
{
|
|
got => $order_1_0->tax_value_on_ordering,
|
|
expected => 7.03,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
$order_1_0->unitprice(70.29);
|
|
$order_1_0->populate_with_prices_for_ordering();
|
|
|
|
# If a unitprice is provided at ordering, we calculate the tax from that
|
|
compare(
|
|
{
|
|
got => $order_1_0->tax_value_on_ordering,
|
|
expected => 6.69,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
|
|
$order_1_0->populate_with_prices_for_receiving();
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_0->unitprice_tax_included,
|
|
expected => 73.80,
|
|
conf => '1 0',
|
|
field => 'unitprice_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->unitprice_tax_excluded,
|
|
expected => 70.29,
|
|
conf => '1 0',
|
|
field => 'unitprice_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->tax_value_on_receiving,
|
|
expected => 7.03,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 0 1 (Vendor List prices do not include tax / Invoice prices include tax)' => sub {
|
|
plan tests => 9;
|
|
|
|
my $biblionumber_0_1 = 45;
|
|
my $order_0_1 = Koha::Acquisition::Order->new({
|
|
biblionumber => $biblionumber_0_1,
|
|
quantity => 2,
|
|
listprice => 82,
|
|
unitprice => 0,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_0_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate_on_ordering => 0.0500,
|
|
tax_rate_on_receiving => 0.0500,
|
|
discount => 10,
|
|
datereceived => $today
|
|
});
|
|
|
|
$order_0_1->populate_with_prices_for_ordering();
|
|
|
|
compare(
|
|
{
|
|
got => $order_0_1->rrp_tax_included,
|
|
expected => 86.10,
|
|
conf => '0 1',
|
|
field => 'rrp_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->rrp_tax_excluded,
|
|
expected => 82.00,
|
|
conf => '0 1',
|
|
field => 'rrp_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->ecost_tax_included,
|
|
expected => 77.49,
|
|
conf => '0 1',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->ecost_tax_excluded,
|
|
expected => 73.80,
|
|
conf => '0 1',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
# If we order with unitprice = 0, tax is calculated from the ecost
|
|
# (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost
|
|
compare(
|
|
{
|
|
got => $order_0_1->tax_value_on_ordering,
|
|
expected => 7.38,
|
|
conf => '0 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
$order_0_1->unitprice(77.490000);
|
|
$order_0_1->populate_with_prices_for_ordering();
|
|
|
|
# If a unitprice is provided at ordering, we calculate the tax from that
|
|
compare(
|
|
{
|
|
got => $order_0_1->tax_value_on_ordering,
|
|
expected => 7.75,
|
|
conf => '0 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
$order_0_1->populate_with_prices_for_receiving();
|
|
|
|
compare(
|
|
{
|
|
got => $order_0_1->unitprice_tax_included,
|
|
expected => 77.49,
|
|
conf => '0 1',
|
|
field => 'unitprice_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->unitprice_tax_excluded,
|
|
expected => 73.80,
|
|
conf => '0 1',
|
|
field => 'unitprice_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->tax_value_on_receiving,
|
|
expected => 7.38,
|
|
conf => '0 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
};
|
|
}
|
|
|
|
sub compare {
|
|
my ($params) = @_;
|
|
is(
|
|
Koha::Number::Price->new( $params->{got} )->format,
|
|
Koha::Number::Price->new( $params->{expected} )->format,
|
|
"configuration $params->{conf}: $params->{field} should be correctly calculated"
|
|
);
|
|
}
|
|
|
|
# format_for_editing
|
|
for my $currency_format ( qw( US FR ) ) {
|
|
t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format );
|
|
is( Koha::Number::Price->new( 1234567 )->format_for_editing, '1234567.00', 'format_for_editing should return unformated integer part with 2 decimals' );
|
|
is( Koha::Number::Price->new( 1234567.89 )->format_for_editing, '1234567.89', 'format_for_editing should return unformated integer part with 2 decimals' );
|
|
}
|