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

(-)a/C4/Serials.pm (-6 / +9 lines)
Lines 97-103 sub GetSuppliersWithLateIssues { Link Here
97
    WHERE id > 0
97
    WHERE id > 0
98
        AND (
98
        AND (
99
            (planneddate < now() AND serial.status=1)
99
            (planneddate < now() AND serial.status=1)
100
            OR serial.STATUS = 3 OR serial.STATUS = 4
100
            OR serial.STATUS IN (3, 4, 41, 42, 43, 44)
101
        )
101
        )
102
        AND subscription.closed = 0
102
        AND subscription.closed = 0
103
    ORDER BY name|;
103
    ORDER BY name|;
Lines 421-427 sub PrepareSerialsData { Link Here
421
            }
421
            }
422
        }
422
        }
423
        $subs->{ "status" . $subs->{'status'} } = 1;
423
        $subs->{ "status" . $subs->{'status'} } = 1;
424
        $subs->{"checked"}                      = $subs->{'status'} =~ /1|3|4|7/;
424
        if ( grep { $_ == $subs->{status} } ( 1, 3, 4, 41, 42, 43, 44, 7 ) ) {
425
            $subs->{"checked"} = 1;
426
        }
425
427
426
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
428
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
427
            $year = $subs->{'year'};
429
            $year = $subs->{'year'};
Lines 841-847 sub GetLatestSerials { Link Here
841
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
843
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
842
                        FROM     serial
844
                        FROM     serial
843
                        WHERE    subscriptionid = ?
845
                        WHERE    subscriptionid = ?
844
                        AND      (status =2 or status=4)
846
                        AND      status IN (2, 4, 41, 42, 43, 44)
845
                        ORDER BY publisheddate DESC LIMIT 0,$limit
847
                        ORDER BY publisheddate DESC LIMIT 0,$limit
846
                ";
848
                ";
847
    my $sth = $dbh->prepare($strsth);
849
    my $sth = $dbh->prepare($strsth);
Lines 1140-1146 sub ModSerialStatus { Link Here
1140
                $missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g;
1142
                $missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g;
1141
            }
1143
            }
1142
            $missinglist .= "; $serialseq"
1144
            $missinglist .= "; $serialseq"
1143
                if $status==4 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/;
1145
                if ( $status==4 or $status == 41 or $status == 42 or $status == 43 or $status == 44 )
1146
                    && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/;
1144
            $missinglist .= "; not issued $serialseq"
1147
            $missinglist .= "; not issued $serialseq"
1145
                if $status==5 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/;
1148
                if $status==5 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/;
1146
1149
Lines 1865-1871 sub GetLateOrMissingIssues { Link Here
1865
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
1868
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
1866
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
1869
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
1867
                WHERE subscription.subscriptionid = serial.subscriptionid 
1870
                WHERE subscription.subscriptionid = serial.subscriptionid 
1868
                AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
1871
                AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
1869
                AND subscription.aqbooksellerid=$supplierid
1872
                AND subscription.aqbooksellerid=$supplierid
1870
                $byserial
1873
                $byserial
1871
                ORDER BY $order"
1874
                ORDER BY $order"
Lines 1882-1888 sub GetLateOrMissingIssues { Link Here
1882
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
1885
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
1883
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
1886
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
1884
                WHERE subscription.subscriptionid = serial.subscriptionid 
1887
                WHERE subscription.subscriptionid = serial.subscriptionid 
1885
                        AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
1888
                        AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
1886
                $byserial
1889
                $byserial
1887
                ORDER BY $order"
1890
                ORDER BY $order"
1888
        );
1891
        );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+4 lines)
Lines 660-665 function verify_images() { Link Here
660
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
660
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
661
                      [% IF ( latestserial.status3 ) %]Late[% END %]
661
                      [% IF ( latestserial.status3 ) %]Late[% END %]
662
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
662
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
663
                      [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
664
                      [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
665
                      [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
666
                      [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
663
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
667
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
664
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
668
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
665
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
669
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (+8 lines)
Lines 206-211 Link Here
206
		<option>Arrived</option>
206
		<option>Arrived</option>
207
		<option>Late</option>
207
		<option>Late</option>
208
		<option>Missing</option>
208
		<option>Missing</option>
209
        <option>Missing (never received)</option>
210
        <option>Missing (sold out)</option>
211
        <option>Missing (damaged)</option>
212
        <option>Missing (lost)</option>
209
		<option>Claimed</option>
213
		<option>Claimed</option>
210
        <option>Stopped</option>
214
        <option>Stopped</option>
211
	    </select>
215
	    </select>
Lines 285-290 Link Here
285
                            [% IF ( missingissue.status2 ) %]Arrived[% END %]
289
                            [% IF ( missingissue.status2 ) %]Arrived[% END %]
286
                            [% IF ( missingissue.status3 ) %]Late[% END %]
290
                            [% IF ( missingissue.status3 ) %]Late[% END %]
287
                            [% IF ( missingissue.status4 ) %]Missing[% END %]
291
                            [% IF ( missingissue.status4 ) %]Missing[% END %]
292
                            [% IF ( missingissue.status41 ) %]Missing (never received)[% END %]
293
                            [% IF ( missingissue.status42 ) %]Missing (sold out)[% END %]
294
                            [% IF ( missingissue.status43 ) %]Missing (damaged)[% END %]
295
                            [% IF ( missingissue.status44 ) %]Missing (lost)[% END %]
288
                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
296
                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
289
                            [% IF ( missingissue.status8 ) %]Stopped[% END %]
297
                            [% IF ( missingissue.status8 ) %]Stopped[% END %]
290
                        </td>
298
                        </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt (+4 lines)
Lines 72-77 function active(numlayer) Link Here
72
                    [% IF ( serial.status2 ) %]Arrived[% END %]
72
                    [% IF ( serial.status2 ) %]Arrived[% END %]
73
                    [% IF ( serial.status3 ) %]Late[% END %]
73
                    [% IF ( serial.status3 ) %]Late[% END %]
74
                    [% IF ( serial.status4 ) %]Missing[% END %]
74
                    [% IF ( serial.status4 ) %]Missing[% END %]
75
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
76
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
77
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
78
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
75
                    [% IF ( serial.status5 ) %]Not issued[% END %]
79
                    [% IF ( serial.status5 ) %]Not issued[% END %]
76
                    [% IF ( serial.status6 ) %]Delete[% END %]
80
                    [% IF ( serial.status6 ) %]Delete[% END %]
77
                    [% IF ( serial.status7 ) %]Claimed[% END %]
81
                    [% IF ( serial.status7 ) %]Claimed[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (+4 lines)
Lines 306-311 $(document).ready(function() { Link Here
306
                    [% IF ( serial.status2 ) %]Arrived[% END %]
306
                    [% IF ( serial.status2 ) %]Arrived[% END %]
307
                    [% IF ( serial.status3 ) %]Late[% END %]
307
                    [% IF ( serial.status3 ) %]Late[% END %]
308
                    [% IF ( serial.status4 ) %]Missing[% END %]
308
                    [% IF ( serial.status4 ) %]Missing[% END %]
309
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
310
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
311
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
312
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
309
                    [% IF ( serial.status5 ) %]Not issued[% END %]
313
                    [% IF ( serial.status5 ) %]Not issued[% END %]
310
                    [% IF ( serial.status6 ) %]Delete[% END %]
314
                    [% IF ( serial.status6 ) %]Delete[% END %]
311
                    [% IF ( serial.status7 ) %]Claimed[% END %]
315
                    [% IF ( serial.status7 ) %]Claimed[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (+40 lines)
Lines 196-201 $(document).ready(function() { Link Here
196
            [% ELSE %]
196
            [% ELSE %]
197
              <option value="4">Missing</option>
197
              <option value="4">Missing</option>
198
            [% END %]
198
            [% END %]
199
            [% IF ( serialslis.status41 ) %]
200
              <option value="41" selected="selected">Missing (never received)</option>
201
            [% ELSE %]
202
              <option value="41">Missing (never received)</option>
203
            [% END %]
204
            [% IF ( serialslis.status42 ) %]
205
              <option value="42" selected="selected">Missing (sold out)</option>
206
            [% ELSE %]
207
              <option value="42">Missing (sold out)</option>
208
            [% END %]
209
            [% IF ( serialslis.status43 ) %]
210
              <option value="43" selected="selected">Missing (damaged)</option>
211
            [% ELSE %]
212
              <option value="43">Missing (damaged)</option>
213
            [% END %]
214
            [% IF ( serialslis.status44 ) %]
215
              <option value="44" selected="selected">Missing (lost)</option>
216
            [% ELSE %]
217
              <option value="44">Missing (lost)</option>
218
            [% END %]
199
            [% IF ( serialslis.status7 ) %]
219
            [% IF ( serialslis.status7 ) %]
200
              <option value="7" selected="selected">Claimed</option>
220
              <option value="7" selected="selected">Claimed</option>
201
            [% ELSE %]
221
            [% ELSE %]
Lines 306-311 $(document).ready(function() { Link Here
306
                  [% ELSE %]
326
                  [% ELSE %]
307
                    <option value="4">Missing</option>
327
                    <option value="4">Missing</option>
308
                  [% END %]
328
                  [% END %]
329
                  [% IF ( newserialloo.status41 ) %]
330
                    <option value="41" selected="selected">Missing (never received)</option>
331
                  [% ELSE %]
332
                    <option value="41">Missing (never received)</option>
333
                  [% END %]
334
                  [% IF ( newserialloo.status42 ) %]
335
                    <option value="42" selected="selected">Missing (sold out)</option>
336
                  [% ELSE %]
337
                    <option value="42">Missing (sold out)</option>
338
                  [% END %]
339
                  [% IF ( newserialloo.status43 ) %]
340
                    <option value="43" selected="selected">Missing (damaged)</option>
341
                  [% ELSE %]
342
                    <option value="43">Missing (damaged)</option>
343
                  [% END %]
344
                  [% IF ( newserialloo.status44 ) %]
345
                    <option value="44" selected="selected">Missing (lost)</option>
346
                  [% ELSE %]
347
                    <option value="44">Missing (lost)</option>
348
                  [% END %]
309
                  [% IF ( newserialloo.status7 ) %]
349
                  [% IF ( newserialloo.status7 ) %]
310
                    <option value="7" selected="selected">Claimed</option>
350
                    <option value="7" selected="selected">Claimed</option>
311
                  [% ELSE %]
351
                  [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tt (+20 lines)
Lines 127-132 function barcode_check(){ Link Here
127
					[% ELSE %]
127
					[% ELSE %]
128
						<option value="4">Missing</option>
128
						<option value="4">Missing</option>
129
					[% END %]
129
					[% END %]
130
                    [% IF ( serialslis.status41 ) %]
131
                      <option value="41" selected="selected">Missing (never received)</option>
132
                    [% ELSE %]
133
                      <option value="41">Missing (never received)</option>
134
                    [% END %]
135
                    [% IF ( serialslis.status42 ) %]
136
                      <option value="42" selected="selected">Missing (sold out)</option>
137
                    [% ELSE %]
138
                      <option value="42">Missing (sold out)</option>
139
                    [% END %]
140
                    [% IF ( serialslis.status43 ) %]
141
                      <option value="43" selected="selected">Missing (damaged)</option>
142
                    [% ELSE %]
143
                      <option value="43">Missing (damaged)</option>
144
                    [% END %]
145
                    [% IF ( serialslis.status44 ) %]
146
                      <option value="44" selected="selected">Missing (lost)</option>
147
                    [% ELSE %]
148
                      <option value="44">Missing (lost)</option>
149
                    [% END %]
130
					[% IF ( serialslis.status5 ) %]
150
					[% IF ( serialslis.status5 ) %]
131
                        <option value="5" selected="selected">Not available</option>
151
                        <option value="5" selected="selected">Not available</option>
132
					[% ELSE %]
152
					[% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (+4 lines)
Lines 350-355 $(document).ready(function() { Link Here
350
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
350
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
351
                    [% IF ( serialslis.status3 ) %]Late[% END %]
351
                    [% IF ( serialslis.status3 ) %]Late[% END %]
352
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
352
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
353
                    [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
354
                    [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
355
                    [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
356
                    [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
353
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
357
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
354
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
358
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
355
                    [% IF ( serialslis.status7 ) %]
359
                    [% IF ( serialslis.status7 ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-14 / +13 lines)
Lines 1208-1227 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
1208
                </td>
1208
                </td>
1209
                <td>    [% latestserial.planneddate %]
1209
                <td>    [% latestserial.planneddate %]
1210
                </td>
1210
                </td>
1211
                <td>    [% IF ( latestserial.status1 ) %]Awaited
1211
                <td>
1212
                    [% ELSE %]
1212
                    [% IF ( latestserial.status1 ) %]Expected[% END %]
1213
                    [% IF ( latestserial.status2 ) %]Arrived
1213
                    [% IF ( latestserial.status2 ) %]Arrived[% END %]
1214
                    [% ELSE %]
1214
                    [% IF ( latestserial.status3 ) %]Late[% END %]
1215
                    [% IF ( latestserial.status3 ) %]Late
1215
                    [% IF ( latestserial.status4 ) %]Missing[% END %]
1216
                    [% ELSE %]
1216
                    [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
1217
                    [% IF ( latestserial.status4 ) %]Missing
1217
                    [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
1218
                    [% ELSE %]
1218
                    [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
1219
                    [% IF ( latestserial.status5 ) %]Not issued
1219
                    [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
1220
                    [% END %]
1220
                    [% IF ( latestserial.status5 ) %]Not issued[% END %]
1221
                    [% END %]
1221
                    [% IF ( latestserial.status6 ) %]Delete[% END %]
1222
                    [% END %]
1222
                    [% IF ( latestserial.status7 ) %]Claimed[% END %]
1223
                    [% END %]
1223
                    [% IF ( latestserial.status8 ) %]Stopped[% END %]
1224
                    [% END %]
1225
                </td>
1224
                </td>
1226
                <td>    [% latestserial.notes %]
1225
                <td>    [% latestserial.notes %]
1227
                </td>
1226
                </td>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt (-1 / +4 lines)
Lines 224-229 function showlayer(numlayer){ Link Here
224
              [% IF ( serial.status2 ) %]Arrived[% END %]
224
              [% IF ( serial.status2 ) %]Arrived[% END %]
225
              [% IF ( serial.status3 ) %]Late[% END %]
225
              [% IF ( serial.status3 ) %]Late[% END %]
226
              [% IF ( serial.status4 ) %]Missing[% END %]
226
              [% IF ( serial.status4 ) %]Missing[% END %]
227
              [% IF ( serial.status41 ) %]Missing (never received)[% END %]
228
              [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
229
              [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
230
              [% IF ( serial.status44 ) %]Missing (lost)[% END %]
227
              [% IF ( serial.status5 ) %]Not available[% END %]
231
              [% IF ( serial.status5 ) %]Not available[% END %]
228
              [% IF ( serial.status6 ) %]Delete[% END %]
232
              [% IF ( serial.status6 ) %]Delete[% END %]
229
              [% IF ( serial.status7 ) %]Claimed[% END %]
233
              [% IF ( serial.status7 ) %]Claimed[% END %]
230
- 

Return to bug 10851