From db1ef62d123bcd5dea96da0ae38a1cfb57652ea6 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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
---
 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 04efe7acf8..8b02efb03f 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;
 
@@ -892,7 +893,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 => [
@@ -907,7 +908,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.20.1