View | Details | Raw Unified | Return to bug 41387
Collapse All | Expand All

(-)a/C4/Serials.pm (+2 lines)
Lines 917-922 sub GetNextSeq { Link Here
917
917
918
        my $dt = dt_from_string($planneddate);
918
        my $dt = dt_from_string($planneddate);
919
        $calculated =~ s/\{Month\}/$dt->month/eg;
919
        $calculated =~ s/\{Month\}/$dt->month/eg;
920
        $calculated =~ s/\{Month2\}/sprintf("%02d", $dt->month())/eg;
920
        $calculated =~ s/\{MonthName\}/$dt->month_name/eg;
921
        $calculated =~ s/\{MonthName\}/$dt->month_name/eg;
921
        $calculated =~ s/\{Year\}/$dt->year/eg;
922
        $calculated =~ s/\{Year\}/$dt->year/eg;
922
        $calculated =~ s/\{Day\}/$dt->day/eg;
923
        $calculated =~ s/\{Day\}/$dt->day/eg;
Lines 968-973 sub GetSeq { Link Here
968
969
969
    my $dt = dt_from_string( $subscription->{firstacquidate} );
970
    my $dt = dt_from_string( $subscription->{firstacquidate} );
970
    $calculated =~ s/\{Month\}/$dt->month/eg;
971
    $calculated =~ s/\{Month\}/$dt->month/eg;
972
    $calculated =~ s/\{Month2\}/sprintf("%02d", $dt->month())/eg;
971
    $calculated =~ s/\{MonthName\}/$dt->month_name/eg;
973
    $calculated =~ s/\{MonthName\}/$dt->month_name/eg;
972
    $calculated =~ s/\{Year\}/$dt->year/eg;
974
    $calculated =~ s/\{Year\}/$dt->year/eg;
973
    $calculated =~ s/\{Day\}/$dt->day/eg;
975
    $calculated =~ s/\{Day\}/$dt->day/eg;
(-)a/t/db_dependent/Serials.t (-2 / +17 lines)
Lines 704-710 subtest "NewSubscription|ModSubscription" => sub { Link Here
704
};
704
};
705
705
706
subtest "test numbering pattern with dates in GetSeq GetNextSeq" => sub {
706
subtest "test numbering pattern with dates in GetSeq GetNextSeq" => sub {
707
    plan tests => 4;
707
    plan tests => 6;
708
    $subscription = {
708
    $subscription = {
709
        lastvalue1     => 1, lastvalue2 => 1, lastvalue3 => 1,
709
        lastvalue1     => 1, lastvalue2 => 1, lastvalue3 => 1,
710
        innerloop1     => 0, innerloop2 => 0, innerloop3 => 0,
710
        innerloop1     => 0, innerloop2 => 0, innerloop3 => 0,
Lines 737-742 subtest "test numbering pattern with dates in GetSeq GetNextSeq" => sub { Link Here
737
        'GetNextSeq correctly calculates numbering from planned date, leap year'
737
        'GetNextSeq correctly calculates numbering from planned date, leap year'
738
    );
738
    );
739
739
740
    $pattern = {
741
        numberingmethod => '{Year} {Day} {DayName} {Month2} {MonthName}',
742
    };
743
    $subscription->{firstacquidate} = '2024-02-29';
744
    $planneddate                    = '2024-02-29';
745
    $numbering                      = GetSeq( $subscription, $pattern );
746
    is(
747
        $numbering, '2024 29 Thursday 02 February',
748
        'GetSeq correctly calculates 2 digit month numbering from first aqui date, leap year'
749
    );
750
    ($numbering) = GetNextSeq( $subscription, $pattern, undef, $planneddate );
751
    is(
752
        $numbering, '2024 29 Thursday 02 February',
753
        'GetNextSeq correctly calculates 2 digit month numbering from planned date, leap year'
754
    );
755
740
};
756
};
741
757
742
subtest "DelSubscription" => sub {
758
subtest "DelSubscription" => sub {
743
- 

Return to bug 41387