gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2020-06-25 10:16:45 +01:00 committed by Jonathan Druart
parent 58edcef03d
commit d46fa45dbf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Koha/Account/Line.pm
View File

@ -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;

2
t/db_dependent/Koha/Account.t
View File

@ -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);