20d9ed618f
This patch renames the variable according to the new DB column names * gste => tax_excluded * gsti => tax_included * gstrate => tax_rate * gstvalue => tax_value This patch also modify the ModReceiveOrder subroutine: * Edit vendor note on receiving is not possible, so the code should not permit that. * Update ModReceiveOrder to pass a hashref And that's all! git grep on gste, gsti, gstrate and gstvalue should not return any code that can be executed. Signed-off-by: Laurence Rault <laurence.rault@biblibre.com> Signed-off-by: Francois Charbonnier <francois.charbonnier@inlibro.com> Signed-off-by: Sonia Bouis <sonia.bouis@univ-lyon3.fr> Signed-off-by: Sonia Bouis <koha@univ-lyon3.fr> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
635 lines
19 KiB
Perl
635 lines
19 KiB
Perl
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 => 17;
|
|
} else {
|
|
plan skip_all => "Need Test::DBIx::Class"
|
|
}
|
|
}
|
|
|
|
use_ok('C4::Acquisition');
|
|
use_ok('C4::Bookseller');
|
|
use_ok('C4::Context');
|
|
use_ok('Koha::Number::Price');
|
|
|
|
t::lib::Mocks::mock_preference( 'gist', '0.02|0.05|0.196' );
|
|
|
|
use Test::DBIx::Class {
|
|
schema_class => 'Koha::Schema',
|
|
connect_info => ['dbi:SQLite:dbname=:memory:','',''],
|
|
connect_opts => { name_sep => '.', quote_char => '`', },
|
|
fixture_class => '::Populate',
|
|
}, 'Currency' ;
|
|
|
|
my $db = Test::MockModule->new('Koha::Database');
|
|
$db->mock( _new_schema => sub { return Schema(); } );
|
|
|
|
fixtures_ok [
|
|
Currency => [
|
|
[ qw/ currency symbol rate active / ],
|
|
[[ 'my_cur', '€', 1, 1, ]],
|
|
],
|
|
], 'add currency fixtures';
|
|
|
|
my $bookseller_module = Test::MockModule->new('Koha::Acquisition::Bookseller');
|
|
|
|
my ( $basketno_0_0, $basketno_1_1, $basketno_1_0, $basketno_0_1 );
|
|
my ( $invoiceid_0_0, $invoiceid_1_1, $invoiceid_1_0, $invoiceid_0_1 );
|
|
my $today;
|
|
|
|
for my $currency_format ( qw( US FR ) ) {
|
|
t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format );
|
|
subtest 'Configuration 1: 0 0' => sub {
|
|
plan tests => 12;
|
|
$bookseller_module->mock(
|
|
'fetch',
|
|
sub {
|
|
return { listincgst => 0, invoiceincgst => 0 };
|
|
}
|
|
);
|
|
|
|
my $biblionumber_0_0 = 42;
|
|
|
|
my $order_0_0 = {
|
|
biblionumber => $biblionumber_0_0,
|
|
quantity => 2,
|
|
listprice => 82.000000,
|
|
unitprice => 73.80000,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_0_0,
|
|
invoiceid => $invoiceid_0_0,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate => 0.0500,
|
|
discount => 10.0000,
|
|
datereceived => $today
|
|
};
|
|
$order_0_0 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_0_0,
|
|
booksellerid => 'just_something',
|
|
ordering => 1,
|
|
}
|
|
);
|
|
|
|
# Note that this configuration is correct \o/
|
|
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},
|
|
expected => 7.38,
|
|
conf => '0 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->{total_tax_included},
|
|
expected => 154.98,
|
|
conf => '0 0',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->{total_tax_excluded},
|
|
expected => 147.60,
|
|
conf => '0 0',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
|
|
$order_0_0 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_0_0,
|
|
booksellerid => 'just_something',
|
|
receiving => 1,
|
|
}
|
|
);
|
|
|
|
# Note that this configuration is correct \o/
|
|
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},
|
|
expected => 7.38,
|
|
conf => '0 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->{total_tax_included},
|
|
expected => 154.98,
|
|
conf => '0 0',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_0->{total_tax_excluded},
|
|
expected => 147.60,
|
|
conf => '0 0',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 1 1' => sub {
|
|
plan tests => 12;
|
|
$bookseller_module->mock(
|
|
'fetch',
|
|
sub {
|
|
return { listincgst => 1, invoiceincgst => 1 };
|
|
}
|
|
);
|
|
|
|
my $biblionumber_1_1 = 43;
|
|
my $order_1_1 = {
|
|
biblionumber => $biblionumber_1_1,
|
|
quantity => 2,
|
|
listprice => 82.000000,
|
|
unitprice => 73.800000,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_1_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate => 0.0500,
|
|
discount => 10.0000,
|
|
datereceived => $today
|
|
};
|
|
|
|
$order_1_1 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_1_1,
|
|
booksellerid => 'just_something',
|
|
ordering => 1,
|
|
}
|
|
);
|
|
|
|
# Note that this configuration is *not* correct
|
|
# tax_value should be 7.03 instead of 7.02
|
|
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},
|
|
expected => 7.02,
|
|
conf => '1 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->{total_tax_included},
|
|
expected => 147.60,
|
|
conf => '1 1',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->{total_tax_excluded},
|
|
expected => 140.58,
|
|
conf => '1 1',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
|
|
$order_1_1 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_1_1,
|
|
booksellerid => 'just_something',
|
|
receiving => 1,
|
|
}
|
|
);
|
|
# Note that this configuration is *not* correct!
|
|
# tax_value should be 7.03
|
|
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},
|
|
expected => 7.02,
|
|
conf => '1 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->{total_tax_included},
|
|
expected => 147.60,
|
|
conf => '1 1',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_1->{total_tax_excluded},
|
|
expected => 140.58,
|
|
conf => '1 1',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 1 0' => sub {
|
|
plan tests => 12;
|
|
$bookseller_module->mock(
|
|
'fetch',
|
|
sub {
|
|
return { listincgst => 1, invoiceincgst => 0 };
|
|
}
|
|
);
|
|
|
|
my $biblionumber_1_0 = 44;
|
|
my $order_1_0 = {
|
|
biblionumber => $biblionumber_1_0,
|
|
quantity => 2,
|
|
listprice => 82.000000,
|
|
unitprice => 73.804500,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_1_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.01,
|
|
ecost => 73.80,
|
|
tax_rate => 0.0500,
|
|
discount => 10.0000,
|
|
datereceived => $today
|
|
};
|
|
|
|
$order_1_0 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_1_0,
|
|
booksellerid => 'just_something',
|
|
ordering => 1,
|
|
}
|
|
);
|
|
|
|
# Note that this configuration is *not* correct!
|
|
# rrp_tax_included should be 82 (what we inserted!)
|
|
# tax_value should be 7.03 instead of 7.02
|
|
|
|
compare(
|
|
{
|
|
got => $order_1_0->{rrp_tax_included},
|
|
expected => 82.01,
|
|
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'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->{tax_value},
|
|
expected => 7.02,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->{total_tax_included},
|
|
expected => 147.60,
|
|
conf => '1 0',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->{total_tax_excluded},
|
|
expected => 140.58,
|
|
conf => '1 0',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
|
|
$order_1_0 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_1_0,
|
|
booksellerid => 'just_something',
|
|
receiving => 1,
|
|
}
|
|
);
|
|
# Note that this configuration is *not* correct!
|
|
# gstvalue should be 7.03
|
|
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},
|
|
expected => 7.02,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->{total_tax_included},
|
|
expected => 147.60,
|
|
conf => '1 0',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_1_0->{total_tax_excluded},
|
|
expected => 140.58,
|
|
conf => '1 0',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
};
|
|
|
|
subtest 'Configuration 1: 0 1' => sub {
|
|
plan tests => 12;
|
|
$bookseller_module->mock(
|
|
'fetch',
|
|
sub {
|
|
return { listincgst => 0, invoiceincgst => 1 };
|
|
}
|
|
);
|
|
|
|
my $biblionumber_0_1 = 45;
|
|
my $order_0_1 = {
|
|
biblionumber => $biblionumber_0_1,
|
|
quantity => 2,
|
|
listprice => 82.000000,
|
|
unitprice => 73.800000,
|
|
quantityreceived => 2,
|
|
basketno => $basketno_1_1,
|
|
invoiceid => $invoiceid_1_1,
|
|
rrp => 82.00,
|
|
ecost => 73.80,
|
|
tax_rate => 0.0500,
|
|
discount => 10.0000,
|
|
datereceived => $today
|
|
};
|
|
|
|
$order_0_1 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_0_1,
|
|
booksellerid => 'just_something',
|
|
ordering => 1,
|
|
}
|
|
);
|
|
|
|
# Note that this configuration is correct \o/
|
|
compare(
|
|
{
|
|
got => $order_0_1->{rrp_tax_included},
|
|
expected => 86.10,
|
|
conf => '1 0',
|
|
field => 'rrp_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{rrp_tax_excluded},
|
|
expected => 82.00,
|
|
conf => '1 0',
|
|
field => 'rrp_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{ecost_tax_included},
|
|
expected => 77.49,
|
|
conf => '1 0',
|
|
field => 'ecost_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{ecost_tax_excluded},
|
|
expected => 73.80,
|
|
conf => '1 0',
|
|
field => 'ecost_tax_excluded'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{tax_value},
|
|
expected => 7.38,
|
|
conf => '1 0',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{total_tax_included},
|
|
expected => 154.98,
|
|
conf => '1 0',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{total_tax_excluded},
|
|
expected => 147.60,
|
|
conf => '1 0',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
|
|
$order_0_1 = C4::Acquisition::populate_order_with_prices(
|
|
{
|
|
order => $order_0_1,
|
|
booksellerid => 'just_something',
|
|
receiving => 1,
|
|
}
|
|
);
|
|
# Note that this configuration is correct
|
|
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},
|
|
expected => 7.38,
|
|
conf => '0 1',
|
|
field => 'tax_value'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{total_tax_included},
|
|
expected => 154.98,
|
|
conf => '0 1',
|
|
field => 'total_tax_included'
|
|
}
|
|
);
|
|
compare(
|
|
{
|
|
got => $order_0_1->{total_tax_excluded},
|
|
expected => 147.60,
|
|
conf => '0 1',
|
|
field => 'total_tax_excluded'
|
|
}
|
|
);
|
|
};
|
|
}
|
|
|
|
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' );
|
|
}
|