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

(-)a/C4/Serials.pm (-2 / +27 lines)
Lines 840-847 sub GetNextSeq { Link Here
840
        }
840
        }
841
    }
841
    }
842
842
843
    my $numberingmethod = $pattern->{numberingmethod};
844
    my $calculated = "";
843
    my $calculated = "";
844
    my $numberingmethod = "";
845
    if ($pattern eq "pubdate"){
846
        $calculated = dt_from_string( $planneddate )->strftime( '%Y %B %d' );
847
    } else {
848
        $numberingmethod = $pattern->{numberingmethod};
849
    }
845
    if ($numberingmethod) {
850
    if ($numberingmethod) {
846
        $calculated    = $numberingmethod;
851
        $calculated    = $numberingmethod;
847
        my $locale = $subscription->{locale};
852
        my $locale = $subscription->{locale};
Lines 922-927 the sequence in string format Link Here
922
sub GetSeq {
927
sub GetSeq {
923
    my ($subscription, $pattern) = @_;
928
    my ($subscription, $pattern) = @_;
924
929
930
    if ($pattern->{numberingmethod} eq ''){
931
        return "pubdate";
932
    }
933
925
    return unless ($subscription and $pattern);
934
    return unless ($subscription and $pattern);
926
935
927
    my $locale = $subscription->{locale};
936
    my $locale = $subscription->{locale};
Lines 1126-1131 sub ModSerialStatus { Link Here
1126
        my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
1135
        my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
1127
        my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
1136
        my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
1128
1137
1138
        my $nextpublisheddate = GetNextDate($subscription, $publisheddate, 1);
1139
        my ( $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
1140
             $newinnerloop1, $newinnerloop2, $newinnerloop3 );
1141
1142
        if (!defined $pattern){
1143
            $pattern = "pubdate";
1144
            ( $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
1145
              $newinnerloop1, $newinnerloop2, $newinnerloop3 ) = GetNextSeq( $subscription, $pattern, $nextpublisheddate );
1146
        } else {
1147
            ( $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
1148
              $newinnerloop1, $newinnerloop2, $newinnerloop3 ) = GetNextSeq( $subscription, $pattern, $publisheddate );
1149
        }
1150
1129
        # next issue number
1151
        # next issue number
1130
        my (
1152
        my (
1131
            $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
1153
            $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
Lines 1134-1140 sub ModSerialStatus { Link Here
1134
          = GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );
1156
          = GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );
1135
1157
1136
        # next date (calculated from actual date & frequency parameters)
1158
        # next date (calculated from actual date & frequency parameters)
1137
        my $nextpublisheddate = GetNextDate($subscription, $publisheddate, $frequency, 1);
1138
        my $nextpubdate = $nextpublisheddate;
1159
        my $nextpubdate = $nextpublisheddate;
1139
        $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
1160
        $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
1140
                    WHERE  subscriptionid = ?";
1161
                    WHERE  subscriptionid = ?";
Lines 1454-1459 sub NewSubscription { Link Here
1454
    # calculate issue number
1475
    # calculate issue number
1455
    my $serialseq = GetSeq($subscription, $pattern) || q{};
1476
    my $serialseq = GetSeq($subscription, $pattern) || q{};
1456
1477
1478
    if ($serialseq eq "pubdate"){
1479
        $serialseq = dt_from_string( $firstacquidate )->strftime('%Y %B %d');
1480
    }
1481
1457
    Koha::Serial->new(
1482
    Koha::Serial->new(
1458
        {
1483
        {
1459
            serialseq      => $serialseq,
1484
            serialseq      => $serialseq,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (+1 lines)
Lines 370-375 fieldset.rows table { clear: none; margin: 0; } Link Here
370
                                                    [% numberpattern.label | html %]
370
                                                    [% numberpattern.label | html %]
371
                                                </option>
371
                                                </option>
372
                                            [% END %]
372
                                            [% END %]
373
                                            <option value="0">Use publication date</option>
373
                                        </select>
374
                                        </select>
374
                                        <span class="required">Required</span>
375
                                        <span class="required">Required</span>
375
                                    </li>
376
                                    </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (+215 lines)
Lines 82-87 Link Here
82
                        </p>
82
                        </p>
83
                    </div>
83
                    </div>
84
                [% END %]
84
                [% END %]
85
    <div id="subscription_planning">
86
    <div class="row">
87
    <div class="col-sm-12">
88
    <div class="rows">
89
        <ol>
90
            <li><span class="label">Beginning date:</span> [% startdate | html %]
91
            </li>
92
            <li><span class="label">Frequency:</span>
93
                [% frequency.description | html %]
94
            </li>
95
            <li>
96
              <span class="label">Manual history: </span>
97
                [% IF ( manualhistory ) %]
98
                    Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a>
99
                [% ELSE %]
100
                    Disabled
101
                [% END %]
102
            </li>
103
            <li><span class="label">Number pattern:</span>
104
                [% IF ( numberpattern ) %]
105
                    [% numberpattern.label | html %]
106
                [% ELSE %]
107
                    Uses publication date
108
                [% END %]
109
            </li>
110
            [% IF ( numberpattern ) %]
111
            <li><table>
112
            <tr>
113
                <td>Starting with:</td>
114
                [% IF (has_X) %]
115
                    <td align="center">[% lastvalue1 | html %]</td>
116
                [% END %]
117
                [% IF (has_Y) %]
118
                    <td align="center">[% lastvalue2 | html %]</td>
119
                [% END %]
120
                [% IF (has_Z) %]
121
                    <td align="center">[% lastvalue3 | html %]</td>
122
                [% END %]
123
            </tr>
124
            <tr>
125
                <td>Rollover:</td>
126
                [% IF (has_X) %]
127
                    <td align="center">[% numberpattern.whenmorethan1 | html %]</td>
128
                [% END %]
129
                [% IF (has_Y) %]
130
                    <td align="center">[% numberpattern.whenmorethan2 | html %]</td>
131
                [% END %]
132
                [% IF (has_Z) %]
133
                    <td align="center">[% numberpattern.whenmorethan3 | html %]</td>
134
                [% END %]
135
            </tr>
136
            </table></li>
137
            [% END %]
138
            [% IF ( irregular_issues ) %]
139
            <li><span class="label">Irregularity:</span> [% irregular_issues | html %] issues
140
            </li>
141
            [% END %]
142
            <li><span class="label">First arrival:</span> [% firstacquidate | html %]
143
            </li>
144
        [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength | html %]</li>[% END %]
145
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength | html %]</li>[% END %]
146
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength | html %]</li>[% END %]
147
        </ol>
148
    </div>
149
    </div>
150
    </div>
151
    </div>
152
    <div id="subscription_numbering" style="display:none;">
153
        <h3>Numbering calculation</h3>
154
        <p><label>Numbering formula:</label> [% numberingmethod | html %]</p>
155
        <table>
156
            <tr>
157
                <th>&nbsp;</th>
158
                <th>X</th>
159
                <th>Y</th>
160
                <th>Z</th>
161
                </tr>
162
                <tr>
163
                    <td>Add</td>
164
                    <td>
165
                        [% add1 | html %]
166
                    </td>
167
                    <td>
168
                        [% add2 | html %]
169
                    </td>
170
                    <td>
171
                        [% add3 | html %]
172
                    </td>
173
                </tr>
174
                <tr>
175
                    <td>once every</td>
176
                    <td>[% every1 | html %]</td>
177
                    <td>[% every2 | html %]</td>
178
                    <td>[% every3 | html %]</td>
179
                </tr>
180
                <tr>
181
                    <td>When more than</td>
182
                    <td>[% whenmorethan1 | html %] [% IF ( innerloop1 ) %]<br />
183
                        <i>(is [% innerloop1 | html %])</i>[% END %]</td>
184
                    <td>[% whenmorethan2 | html %] [% IF ( innerloop2 ) %]<br />
185
                        <i>(is [% innerloop2 | html %])</i>[% END %]</td>
186
                    <td>[% whenmorethan3 | html %] [% IF ( innerloop3 ) %]<br />
187
                        <i>(is [% innerloop3 | html %])</i>[% END %]</td>
188
                </tr>
189
                <tr>
190
                    <td>Set back to</td>
191
                    <td>[% setto1 | html %]</td>
192
                    <td>[% setto2 | html %]</td>
193
                    <td>[% setto3 | html %]</td>
194
                </tr>
195
                <tr>
196
                    <td>
197
                            Inner counter
198
                    </td>
199
                    <td>[% innerloop1 | html %]</td>
200
                    <td>[% innerloop2 | html %]</td>
201
                    <td>[% innerloop3 | html %]</td>
202
                </tr>
203
                <tr>
204
                    <td>
205
                            Last value
206
                    </td>
207
                    <td>[% lastvalue1 | html %]</td>
208
                    <td>[% lastvalue2 | html %]</td>
209
                    <td>[% lastvalue3 | html %]</td>
210
                </tr>
211
            </table>
212
    </div>
213
    <div id="subscription_issues">
214
        <table>
215
        <tr>
216
            <th>Issue number</th>
217
            <th>Planned date</th>
218
            <th>Published date</th>
219
            <th>Published date (text)</th>
220
            <th>Status</th>
221
        </tr>
222
        [% FOREACH serialslis IN serialslist %]
223
            <tr>
224
                <td>
225
                    [% serialslis.serialseq | html %]
226
                </td>
227
                <td>
228
                    [% IF serialslis.planneddate %]
229
                      [% serialslis.planneddate | html %]
230
                    [% ELSE %]
231
                      Unknown
232
                    [% END %]
233
                </td>
234
                <td>
235
                    [% IF serialslis.publisheddate %]
236
                      [% serialslis.publisheddate | html %]
237
                    [% ELSE %]
238
                      Unknown
239
                    [% END %]
240
                </td>
241
                <td>
242
                    [% serialslis.publisheddatetext | html %]
243
                </td>
244
                <td>
245
                    [% IF ( serialslis.status1 ) %]Expected[% END %]
246
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
247
                    [% IF ( serialslis.status3 ) %]Late[% END %]
248
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
249
                    [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
250
                    [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
251
                    [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
252
                    [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
253
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
254
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
255
                    [% IF ( serialslis.status7 ) %]
256
                      Claimed
257
                      [% IF ( serialslis.claimdate ) %]
258
                        [% serialslis.claimdate | html %]
259
                      [% END %]
260
                    [% END %]
261
                    [% IF ( serialslis.status8 ) %]Stopped[% END %]
262
                </td>
263
            </tr>
264
        [% END %]
265
        </table>
266
    </div>
267
    <div id="subscription_summary">
268
    <div class="row">
269
    <div class="col-sm-12">
270
    <div class="rows">
271
        <ol>
272
            <li><span class="label">Start date:</span> [% startdate | html %] </li>
273
            <li><span class="label">End date:</span> [% enddate | html %]</li>
274
            <li><span class="label">History start date:</span> [% histstartdate | html %] </li>
275
            <li><span class="label">History end date:</span> [% histenddate | html %]</li>
276
            <li><span class="label">Received issues:</span>[% recievedlist | html | html_line_break %]</li>
277
            <li><span class="label">Missing issues:</span>[% missinglist | html | html_line_break %]</li>
278
            <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li>
279
            <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li>
280
            <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li>
281
            <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li>
282
        </ol>
283
    </div>
284
    </div>
285
    </div>
286
    </div>
287
288
    [% IF orders_grouped.size %]
289
        <div id="acquisition_details">
290
            <h2>Acquisition details</h2>
291
            <table id="orders">
292
                <caption>
293
                  <span class="actions">
294
                  <a href="#" id="hide_received_orders">Hide already received orders</a>
295
                  | <a href="#" id="show_all_orders">Show all orders</a>
296
                  | <a href="#" id="expand_all">Expand all</a>
297
                  | <a href="#" id="collapse_all">Collapse all</a>
298
                  </span>
299
                </caption>
85
300
86
                [% WRAPPER tabs id= "subscription_description" %]
301
                [% WRAPPER tabs id= "subscription_description" %]
87
                    [% WRAPPER tabs_nav %]
302
                    [% WRAPPER tabs_nav %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-2 / +34 lines)
Lines 252-257 function modifyAdvancedPattern() { Link Here
252
    advancedpatternlocked = 0;
252
    advancedpatternlocked = 0;
253
}
253
}
254
254
255
function clearAdvancedPattern() {
256
    $("#patternname").prop('readOnly', false).val('');
257
    $("#numberingmethod").prop('readOnly', false).val('');
258
259
    $("#advancedpredictionpatternt input").each(function() {
260
        $(this).prop('readOnly', false).val('');
261
    });
262
    $("#advancedpredictionpatternt select").each(function() {
263
        $(this).prop('disabled', false).val('');
264
    });
265
266
    $("#restoreadvancedpatternbutton").hide();
267
    $("#saveadvancedpatternbutton").hide();
268
    $("#modifyadvancedpatternbutton").hide();
269
270
    advancedpatternlocked = 1;
271
}
272
255
function restoreAdvancedPattern() {
273
function restoreAdvancedPattern() {
256
    $("#patternname").prop('readOnly', true).val(globalnumpatterndata.label);
274
    $("#patternname").prop('readOnly', true).val(globalnumpatterndata.label);
257
    $("#numberingmethod").prop('readOnly', true).val(globalnumpatterndata.numberingmethod);
275
    $("#numberingmethod").prop('readOnly', true).val(globalnumpatterndata.numberingmethod);
Lines 553-558 function hidePredcitionPatternTest(){ Link Here
553
    $("#page_2 > div").attr("class","col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2");
571
    $("#page_2 > div").attr("class","col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2");
554
}
572
}
555
573
574
function usedatepattern() {
575
    $("#more_options").hide();
576
    clearAdvancedPattern();
577
    if ($("#advancedpredictionpattern").is(":visible")){
578
        $("#advancedpredictionpattern").toggle();
579
        $(".toggle_advanced_pattern").toggle();
580
    }
581
}
582
556
$(document).ready(function() {
583
$(document).ready(function() {
557
    if ( mana_enabled == 1 ) {
584
    if ( mana_enabled == 1 ) {
558
        mana_search();
585
        mana_search();
Lines 585-591 $(document).ready(function() { Link Here
585
    });
612
    });
586
    $("select#numberpattern").change(function(){
613
    $("select#numberpattern").change(function(){
587
        patternneedtobetested = 1;
614
        patternneedtobetested = 1;
588
        numberpatternload();
615
        console.log($("select#numberpattern").val());
616
        if ($("select#numberpattern").val() == "0"){
617
            usedatepattern();
618
        } else {
619
            numberpatternload();
620
        }
589
    });
621
    });
590
    $("#subtype").change(function(){
622
    $("#subtype").change(function(){
591
        $("input[name='enddate']").val('');
623
        $("input[name='enddate']").val('');
Lines 634-640 $(document).ready(function() { Link Here
634
    if($("#frequency").val() != ""){
666
    if($("#frequency").val() != ""){
635
        frequencyload();
667
        frequencyload();
636
    }
668
    }
637
    if($("#numberpattern").val() != ""){
669
    if($("#numberpattern").val() != "0" && $("#numberpattern").val() != ""){
638
        numberpatternload();
670
        numberpatternload();
639
    }
671
    }
640
672
(-)a/serials/serials-collection.pl (-2 / +13 lines)
Lines 81-86 if($op eq 'gennext' && @subscriptionid){ Link Here
81
                 $newinnerloop1, $newinnerloop2, $newinnerloop3
81
                 $newinnerloop1, $newinnerloop2, $newinnerloop3
82
            ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
82
            ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
83
83
84
            if (!defined $pattern && !defined $newserialseq){
85
                $newserialseq = $expected->{publisheddate};
86
            }
87
84
             ## We generate the next publication date
88
             ## We generate the next publication date
85
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
89
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
86
             my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
90
             my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
Lines 151-158 if (@subscriptionid){ Link Here
151
    $location = $subs->{'location'};
155
    $location = $subs->{'location'};
152
	$callnumber = $subs->{callnumber};
156
	$callnumber = $subs->{callnumber};
153
    my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
157
    my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
154
    my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
155
    $subs->{frequency} = $frequency;
158
    $subs->{frequency} = $frequency;
159
    my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
160
    if (!defined $numberpattern){
161
        $numberpattern->{label} = "Uses publication date";
162
    }
156
    $subs->{numberpattern} = $numberpattern;
163
    $subs->{numberpattern} = $numberpattern;
157
    $subs->{'hasRouting'} = check_routing($subscriptionid);
164
    $subs->{'hasRouting'} = check_routing($subscriptionid);
158
    push @$subscriptiondescs,$subs;
165
    push @$subscriptiondescs,$subs;
Lines 171-177 if (@subscriptionid){ Link Here
171
    my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($s->{periodicity});
178
    my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($s->{periodicity});
172
    my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($s->{numberpattern});
179
    my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($s->{numberpattern});
173
    $s->{frequency} = $frequency;
180
    $s->{frequency} = $frequency;
174
    $s->{numberpattern} = $numberpattern;
181
    if (!defined $numberpattern){
182
        $numberpattern->{label} = "pubdate";
183
    } else {
184
        $s->{numberpattern} = $numberpattern;
185
    }
175
  }
186
  }
176
  my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
187
  my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
177
  $subscriptions=PrepareSerialsData($subscriptioninformation);
188
  $subscriptions=PrepareSerialsData($subscriptioninformation);
(-)a/serials/showpredictionpattern.pl (+9 lines)
Lines 35-40 use Date::Calc qw( Add_Delta_Days Add_Delta_YM Day_of_Week Delta_Days ); Link Here
35
use C4::Auth qw( get_template_and_user );
35
use C4::Auth qw( get_template_and_user );
36
use C4::Output qw( output_html_with_http_headers );
36
use C4::Output qw( output_html_with_http_headers );
37
use C4::Serials qw( GetSubscription GetFictiveIssueNumber GetSeq GetSubscriptionIrregularities GetNextDate GetNextSeq );
37
use C4::Serials qw( GetSubscription GetFictiveIssueNumber GetSeq GetSubscriptionIrregularities GetNextDate GetNextSeq );
38
use POSIX qw(strftime);
38
use C4::Serials::Frequency;
39
use C4::Serials::Frequency;
39
use Koha::DateUtils qw( dt_from_string );
40
use Koha::DateUtils qw( dt_from_string );
40
41
Lines 119-124 if(defined $subscriptionid) { Link Here
119
120
120
my @predictions_loop;
121
my @predictions_loop;
121
my ($calculated) = GetSeq(\%subscription, \%pattern);
122
my ($calculated) = GetSeq(\%subscription, \%pattern);
123
124
if ($calculated eq "pubdate"){
125
    $calculated = dt_from_string( $date )->strftime('%Y %B %d');
126
}
127
122
push @predictions_loop, {
128
push @predictions_loop, {
123
    number => $calculated,
129
    number => $calculated,
124
    publicationdate => $date,
130
    publicationdate => $date,
Lines 166-171 while( $i < 1000 ) { Link Here
166
    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
172
    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
167
    $issuenumber++;
173
    $issuenumber++;
168
    $line{'number'} = $calculated;
174
    $line{'number'} = $calculated;
175
    if ($calculated eq ''){
176
        $line{'number'} = dt_from_string( $date )->strftime('%Y %B %d');
177
    }
169
    $line{'issuenumber'} = $issuenumber;
178
    $line{'issuenumber'} = $issuenumber;
170
    if(@irreg && $issuenumber == $irreg[0]){
179
    if(@irreg && $issuenumber == $irreg[0]){
171
        $line{'not_published'} = 1;
180
        $line{'not_published'} = 1;
(-)a/serials/subscription-add.pl (-1 / +9 lines)
Lines 349-354 sub redirect_add_subscription { Link Here
349
            $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)
349
            $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)
350
        }
350
        }
351
    }
351
    }
352
353
    if ($numberpattern == "0"){ # using publication date as numbering pattern
354
        $numberpattern = undef;
355
    }
356
352
    my $subscriptionid = NewSubscription(
357
    my $subscriptionid = NewSubscription(
353
        $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
358
        $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
354
        $startdate, $periodicity, $numberlength, $weeklength,
359
        $startdate, $periodicity, $numberlength, $weeklength,
Lines 467-472 sub redirect_mod_subscription { Link Here
467
        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
472
        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
468
    }
473
    }
469
474
475
    if ($numberpattern == "0"){ # using publication date as numbering pattern
476
        $numberpattern = undef;
477
    }
478
470
    ModSubscription(
479
    ModSubscription(
471
        $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate,
480
        $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $startdate,
472
        $periodicity, $firstacquidate, join(";",@irregularity),
481
        $periodicity, $firstacquidate, join(";",@irregularity),
473
- 

Return to bug 22188