From d46fa45dbfda455d76acc8dbda65d6f4b94d28e7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 25 Jun 2020 10:16:45 +0100 Subject: [PATCH] Bug 19036: (QA follow-up) Use Koha::DateUtils This patch replaced raw DateTime->now calls with dt_from_string from Koha::DateUtils Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- Koha/Account/Line.pm | 5 +++-- t/db_dependent/Koha/Account.t | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm index d4fbd6bd71..98d7ef3c15 100644 --- a/Koha/Account/Line.pm +++ b/Koha/Account/Line.pm @@ -27,6 +27,7 @@ use Koha::Account::CreditType; use Koha::Account::DebitType; use Koha::Account::Offsets; use Koha::Database; +use Koha::DateUtils; use Koha::Exceptions::Account; use Koha::Items; @@ -905,7 +906,7 @@ sub store { $max //= 0; $self->credit_number($max + 1); } elsif ($AutoCreditNumber eq 'annual') { - my $now = DateTime->now; + my $now = dt_from_string; my $prefix = sprintf('%d-', $now->year); my $max = $rs->search({ -and => [ @@ -920,7 +921,7 @@ sub store { my $userenv = C4::Context->userenv; if ($userenv) { my $branch = $userenv->{branch}; - my $now = DateTime->now; + my $now = dt_from_string; my $prefix = sprintf('%s%d%02d', $branch, $now->year, $now->month); my $pattern = $prefix; $pattern =~ s/([\?%_])/\\$1/g; diff --git a/t/db_dependent/Koha/Account.t b/t/db_dependent/Koha/Account.t index c6341c0cb2..4a8ef7c2cf 100755 --- a/t/db_dependent/Koha/Account.t +++ b/t/db_dependent/Koha/Account.t @@ -1065,7 +1065,7 @@ subtest 'Koha::Account::pay() generates credit number' => sub { my $context = Test::MockModule->new('C4::Context'); $context->mock( 'userenv', { branch => $library->id } ); - my $now = DateTime->now; + my $now = dt_from_string; my $year = $now->year; my $month = $now->month; my ($accountlines_id, $accountline); -- 2.39.5