@@ -, +, @@ formatting --- C4/Acquisition.pm | 2 +- C4/Budgets.pm | 4 ++-- Koha/Number/Price.pm | 7 ++++++- acqui/spent.pl | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -2036,7 +2036,7 @@ returns a price rounded as specified in OrderPriceRounding system preference. sub get_rounded_price { my ( $price ) = @_; my $rounding_pref = C4::Context->preference('OrderPriceRounding'); - if( $rounding_pref eq 'nearest_cent' ) { return Koha::Number::Price->new( $price )->format(); } + if( $rounding_pref eq 'nearest_cent' ) { return Koha::Number::Price->new( $price )->round(); } else { return $price; } } --- a/C4/Budgets.pm +++ a/C4/Budgets.pm @@ -560,14 +560,14 @@ sub GetBudgetHierarchy { # 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( COALESCE(unitprice_tax_included, ecost_tax_included) * quantity ) AS budget_spent + SUM( | . _get_rounding_sql(qq|COALESCE(unitprice_tax_included, ecost_tax_included)|) . q| * 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(q| SELECT aqorders.budget_id, aqbudgets.budget_parent_id, - SUM(ecost_tax_included * quantity) AS budget_ordered + SUM( | . _get_rounding_sql(qq|ecost_tax_included|) . q| * quantity) AS budget_ordered FROM aqorders JOIN aqbudgets USING (budget_id) WHERE quantityreceived = 0 AND datecancellationprinted IS NULL GROUP BY budget_id --- a/Koha/Number/Price.pm +++ a/Koha/Number/Price.pm @@ -19,7 +19,7 @@ package Koha::Number::Price; use Modern::Perl; -use Number::Format qw( format_price ); +use Number::Format; use C4::Context; use Koha::Acquisition::Currencies; @@ -84,6 +84,11 @@ sub round { my $format_params = $self->_format_params; + # To avoid the system to crash, we will not format big number + # We divide per 100 because we want to keep the default DECIMAL_DIGITS (2) + # error - round() overflow. Try smaller precision or use Math::BigFloat + return $self->value if $self->value > Number::Format::MAX_INT/100; + return Number::Format->new(%$format_params)->round($self->value); } --- a/acqui/spent.pl +++ a/acqui/spent.pl @@ -34,6 +34,7 @@ use C4::Auth; use C4::Output; use Modern::Perl; use CGI qw ( -utf8 ); +use C4::Acquisition; use Koha::Acquisition::Invoice::Adjustments; my $dbh = C4::Context->dbh; --