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

(-)a/C4/Serials.pm (-7 / +11 lines)
Lines 100-106 sub GetSuppliersWithLateIssues { Link Here
100
    WHERE id > 0
100
    WHERE id > 0
101
        AND (
101
        AND (
102
            (planneddate < now() AND serial.status=1)
102
            (planneddate < now() AND serial.status=1)
103
            OR serial.STATUS = 3 OR serial.STATUS = 4
103
            OR serial.STATUS IN (3, 4, 41, 42, 43, 44)
104
        )
104
        )
105
        AND subscription.closed = 0
105
        AND subscription.closed = 0
106
    ORDER BY name|;
106
    ORDER BY name|;
Lines 446-452 sub PrepareSerialsData { Link Here
446
            }
446
            }
447
        }
447
        }
448
        $subs->{ "status" . $subs->{'status'} } = 1;
448
        $subs->{ "status" . $subs->{'status'} } = 1;
449
        $subs->{"checked"}                      = $subs->{'status'} =~ /1|3|4|7/;
449
        if ( grep { $_ == $subs->{status} } ( 1, 3, 4, 41, 42, 43, 44, 7 ) ) {
450
            $subs->{"checked"} = 1;
451
        }
450
452
451
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
453
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
452
            $year = $subs->{'year'};
454
            $year = $subs->{'year'};
Lines 885-891 sub GetLatestSerials { Link Here
885
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
887
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
886
                        FROM     serial
888
                        FROM     serial
887
                        WHERE    subscriptionid = ?
889
                        WHERE    subscriptionid = ?
888
                        AND      (status =2 or status=4)
890
                        AND      status IN (2, 4, 41, 42, 43, 44)
889
                        ORDER BY publisheddate DESC LIMIT 0,$limit
891
                        ORDER BY publisheddate DESC LIMIT 0,$limit
890
                ";
892
                ";
891
    my $sth = $dbh->prepare($strsth);
893
    my $sth = $dbh->prepare($strsth);
Lines 1254-1261 sub ModSerialStatus { Link Here
1254
            if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) {
1256
            if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) {
1255
                  _update_receivedlist($subscriptionid);
1257
                  _update_receivedlist($subscriptionid);
1256
            }
1258
            }
1257
            if($status == 4 || $status == 5
1259
            if(  grep { $_ == $status } ( 4, 41, 42, 43, 44, 5 )
1258
              || ($oldstatus == 4 && $status != 4)
1260
              || (
1261
                  grep { $_ == $oldstatus } ( 4, 41, 42, 43, 44 )
1262
                  && ! grep { $_ == $status } ( 4, 41, 42, 43, 44 ) )
1259
              || ($oldstatus == 5 && $status != 5)) {
1263
              || ($oldstatus == 5 && $status != 5)) {
1260
                _update_missinglist($subscriptionid);
1264
                _update_missinglist($subscriptionid);
1261
            }
1265
            }
Lines 2036-2042 sub GetLateOrMissingIssues { Link Here
2036
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
2040
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
2037
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2041
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2038
                WHERE subscription.subscriptionid = serial.subscriptionid 
2042
                WHERE subscription.subscriptionid = serial.subscriptionid 
2039
                AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2043
                AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2040
                AND subscription.aqbooksellerid=$supplierid
2044
                AND subscription.aqbooksellerid=$supplierid
2041
                $byserial
2045
                $byserial
2042
                ORDER BY $order"
2046
                ORDER BY $order"
Lines 2053-2059 sub GetLateOrMissingIssues { Link Here
2053
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
2057
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
2054
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2058
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2055
                WHERE subscription.subscriptionid = serial.subscriptionid 
2059
                WHERE subscription.subscriptionid = serial.subscriptionid 
2056
                        AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2060
                        AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2057
                $byserial
2061
                $byserial
2058
                ORDER BY $order"
2062
                ORDER BY $order"
2059
        );
2063
        );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+4 lines)
Lines 686-691 function verify_images() { Link Here
686
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
686
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
687
                      [% IF ( latestserial.status3 ) %]Late[% END %]
687
                      [% IF ( latestserial.status3 ) %]Late[% END %]
688
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
688
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
689
                      [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
690
                      [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
691
                      [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
692
                      [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
689
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
693
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
690
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
694
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
691
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
695
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (+8 lines)
Lines 209-214 Link Here
209
            <option value="expected">Expected</option>
209
            <option value="expected">Expected</option>
210
            <option value="late">Late</option>
210
            <option value="late">Late</option>
211
            <option value="missing">Missing</option>
211
            <option value="missing">Missing</option>
212
            <option value="missing_never_received">Missing (never received)</option>
213
            <option value="missing_sold_out">Missing (sold out)</option>
214
            <option value="missing_damaged">Missing (damaged)</option>
215
            <option value="missing_lost">Missing (lost)</option>
212
            <option value="claimed">Claimed</option>
216
            <option value="claimed">Claimed</option>
213
	    </select>
217
	    </select>
214
	</li>
218
	</li>
Lines 285-290 Link Here
285
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
289
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
286
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
290
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
287
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
291
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
292
                            [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %]
293
                            [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %]
294
                            [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %]
295
                            [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
288
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
296
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
289
                        </td>
297
                        </td>
290
                        <td class="planneddate">
298
                        <td class="planneddate">
(-)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 253-258 $(document).ready(function() { Link Here
253
                    [% IF ( serial.status2 ) %]Arrived[% END %]
253
                    [% IF ( serial.status2 ) %]Arrived[% END %]
254
                    [% IF ( serial.status3 ) %]Late[% END %]
254
                    [% IF ( serial.status3 ) %]Late[% END %]
255
                    [% IF ( serial.status4 ) %]Missing[% END %]
255
                    [% IF ( serial.status4 ) %]Missing[% END %]
256
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
257
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
258
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
259
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
256
                    [% IF ( serial.status5 ) %]Not issued[% END %]
260
                    [% IF ( serial.status5 ) %]Not issued[% END %]
257
                    [% IF ( serial.status6 ) %]Delete[% END %]
261
                    [% IF ( serial.status6 ) %]Delete[% END %]
258
                    [% IF ( serial.status7 ) %]Claimed[% END %]
262
                    [% 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 269-274 $(document).ready(function() { Link Here
269
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
269
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
270
                    [% IF ( serialslis.status3 ) %]Late[% END %]
270
                    [% IF ( serialslis.status3 ) %]Late[% END %]
271
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
271
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
272
                    [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
273
                    [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
274
                    [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
275
                    [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
272
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
276
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
273
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
277
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
274
                    [% IF ( serialslis.status7 ) %]
278
                    [% IF ( serialslis.status7 ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-14 / +13 lines)
Lines 1209-1228 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
1209
                </td>
1209
                </td>
1210
                <td>    [% latestserial.planneddate %]
1210
                <td>    [% latestserial.planneddate %]
1211
                </td>
1211
                </td>
1212
                <td>    [% IF ( latestserial.status1 ) %]Awaited
1212
                <td>
1213
                    [% ELSE %]
1213
                    [% IF ( latestserial.status1 ) %]Expected[% END %]
1214
                    [% IF ( latestserial.status2 ) %]Arrived
1214
                    [% IF ( latestserial.status2 ) %]Arrived[% END %]
1215
                    [% ELSE %]
1215
                    [% IF ( latestserial.status3 ) %]Late[% END %]
1216
                    [% IF ( latestserial.status3 ) %]Late
1216
                    [% IF ( latestserial.status4 ) %]Missing[% END %]
1217
                    [% ELSE %]
1217
                    [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
1218
                    [% IF ( latestserial.status4 ) %]Missing
1218
                    [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
1219
                    [% ELSE %]
1219
                    [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
1220
                    [% IF ( latestserial.status5 ) %]Not issued
1220
                    [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
1221
                    [% END %]
1221
                    [% IF ( latestserial.status5 ) %]Not issued[% END %]
1222
                    [% END %]
1222
                    [% IF ( latestserial.status6 ) %]Delete[% END %]
1223
                    [% END %]
1223
                    [% IF ( latestserial.status7 ) %]Claimed[% END %]
1224
                    [% END %]
1224
                    [% IF ( latestserial.status8 ) %]Stopped[% END %]
1225
                    [% END %]
1226
                </td>
1225
                </td>
1227
                <td>    [% latestserial.notes %]
1226
                <td>    [% latestserial.notes %]
1228
                </td>
1227
                </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