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

(-)a/C4/Serials.pm (-7 / +11 lines)
Lines 102-108 sub GetSuppliersWithLateIssues { Link Here
102
    WHERE id > 0
102
    WHERE id > 0
103
        AND (
103
        AND (
104
            (planneddate < now() AND serial.status=1)
104
            (planneddate < now() AND serial.status=1)
105
            OR serial.STATUS = 3 OR serial.STATUS = 4
105
            OR serial.STATUS IN (3, 4, 41, 42, 43, 44)
106
        )
106
        )
107
        AND subscription.closed = 0
107
        AND subscription.closed = 0
108
    ORDER BY name|;
108
    ORDER BY name|;
Lines 425-431 sub PrepareSerialsData { Link Here
425
            }
425
            }
426
        }
426
        }
427
        $subs->{ "status" . $subs->{'status'} } = 1;
427
        $subs->{ "status" . $subs->{'status'} } = 1;
428
        $subs->{"checked"}                      = $subs->{'status'} =~ /1|3|4|7/;
428
        if ( grep { $_ == $subs->{status} } ( 1, 3, 4, 41, 42, 43, 44, 7 ) ) {
429
            $subs->{"checked"} = 1;
430
        }
429
431
430
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
432
        if ( $subs->{'year'} && $subs->{'year'} ne "" ) {
431
            $year = $subs->{'year'};
433
            $year = $subs->{'year'};
Lines 879-885 sub GetLatestSerials { Link Here
879
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
881
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
880
                        FROM     serial
882
                        FROM     serial
881
                        WHERE    subscriptionid = ?
883
                        WHERE    subscriptionid = ?
882
                        AND      (status =2 or status=4)
884
                        AND      status IN (2, 4, 41, 42, 43, 44)
883
                        ORDER BY publisheddate DESC LIMIT 0,$limit
885
                        ORDER BY publisheddate DESC LIMIT 0,$limit
884
                ";
886
                ";
885
    my $sth = $dbh->prepare($strsth);
887
    my $sth = $dbh->prepare($strsth);
Lines 1248-1255 sub ModSerialStatus { Link Here
1248
            if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) {
1250
            if ( $status == 2 || ($oldstatus == 2 && $status != 2) ) {
1249
                  _update_receivedlist($subscriptionid);
1251
                  _update_receivedlist($subscriptionid);
1250
            }
1252
            }
1251
            if($status == 4 || $status == 5
1253
            if(  grep { $_ == $status } ( 4, 41, 42, 43, 44, 5 )
1252
              || ($oldstatus == 4 && $status != 4)
1254
              || (
1255
                  grep { $_ == $oldstatus } ( 4, 41, 42, 43, 44 )
1256
                  && ! grep { $_ == $status } ( 4, 41, 42, 43, 44 ) )
1253
              || ($oldstatus == 5 && $status != 5)) {
1257
              || ($oldstatus == 5 && $status != 5)) {
1254
                _update_missinglist($subscriptionid);
1258
                _update_missinglist($subscriptionid);
1255
            }
1259
            }
Lines 2030-2036 sub GetLateOrMissingIssues { Link Here
2030
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
2034
                LEFT JOIN biblio        ON subscription.biblionumber=biblio.biblionumber
2031
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2035
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2032
                WHERE subscription.subscriptionid = serial.subscriptionid 
2036
                WHERE subscription.subscriptionid = serial.subscriptionid 
2033
                AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2037
                AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2034
                AND subscription.aqbooksellerid=$supplierid
2038
                AND subscription.aqbooksellerid=$supplierid
2035
                $byserial
2039
                $byserial
2036
                ORDER BY $order"
2040
                ORDER BY $order"
Lines 2047-2053 sub GetLateOrMissingIssues { Link Here
2047
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
2051
                LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber
2048
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2052
                LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
2049
                WHERE subscription.subscriptionid = serial.subscriptionid 
2053
                WHERE subscription.subscriptionid = serial.subscriptionid 
2050
                        AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2054
                        AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7))
2051
                $byserial
2055
                $byserial
2052
                ORDER BY $order"
2056
                ORDER BY $order"
2053
        );
2057
        );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+4 lines)
Lines 807-812 function verify_images() { Link Here
807
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
807
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
808
                      [% IF ( latestserial.status3 ) %]Late[% END %]
808
                      [% IF ( latestserial.status3 ) %]Late[% END %]
809
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
809
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
810
                      [% IF ( serialslis.status41 ) %]Missing (never received)[% END %]
811
                      [% IF ( serialslis.status42 ) %]Missing (sold out)[% END %]
812
                      [% IF ( serialslis.status43 ) %]Missing (damaged)[% END %]
813
                      [% IF ( serialslis.status44 ) %]Missing (lost)[% END %]
810
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
814
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
811
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
815
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
812
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
816
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (+8 lines)
Lines 216-221 Link Here
216
            <option value="expected">Expected</option>
216
            <option value="expected">Expected</option>
217
            <option value="late">Late</option>
217
            <option value="late">Late</option>
218
            <option value="missing">Missing</option>
218
            <option value="missing">Missing</option>
219
            <option value="missing_never_received">Missing (never received)</option>
220
            <option value="missing_sold_out">Missing (sold out)</option>
221
            <option value="missing_damaged">Missing (damaged)</option>
222
            <option value="missing_lost">Missing (lost)</option>
219
            <option value="claimed">Claimed</option>
223
            <option value="claimed">Claimed</option>
220
	    </select>
224
	    </select>
221
	</li>
225
	</li>
Lines 289-294 Link Here
289
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
293
                            [% IF ( missingissue.status1 ) %]<span class="status-expected">Expected</span>[% END %]
290
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
294
                            [% IF ( missingissue.status3 ) %]<span class="status-late">Late</span>[% END %]
291
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
295
                            [% IF ( missingissue.status4 ) %]<span class="status-missing">Missing</span>[% END %]
296
                            [% IF ( missingissue.status41 ) %]<span class="status-missing_never_received">Missing (never received)</span>[% END %]
297
                            [% IF ( missingissue.status42 ) %]<span class="status-missing_sold_out">Missing (sold out)</span>[% END %]
298
                            [% IF ( missingissue.status43 ) %]<span class="status-missing_damaged">Missing (damaged)</span>[% END %]
299
                            [% IF ( missingissue.status44 ) %]<span class="status-missing_lost">Missing (lost)</span>[% END %]
292
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
300
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
293
                        </td>
301
                        </td>
294
                        <td class="planneddate">
302
                        <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 257-262 $(document).ready(function() { Link Here
257
                    [% IF ( serial.status2 ) %]Arrived[% END %]
257
                    [% IF ( serial.status2 ) %]Arrived[% END %]
258
                    [% IF ( serial.status3 ) %]Late[% END %]
258
                    [% IF ( serial.status3 ) %]Late[% END %]
259
                    [% IF ( serial.status4 ) %]Missing[% END %]
259
                    [% IF ( serial.status4 ) %]Missing[% END %]
260
                    [% IF ( serial.status41 ) %]Missing (never received)[% END %]
261
                    [% IF ( serial.status42 ) %]Missing (sold out)[% END %]
262
                    [% IF ( serial.status43 ) %]Missing (damaged)[% END %]
263
                    [% IF ( serial.status44 ) %]Missing (lost)[% END %]
260
                    [% IF ( serial.status5 ) %]Not issued[% END %]
264
                    [% IF ( serial.status5 ) %]Not issued[% END %]
261
                    [% IF ( serial.status6 ) %]Delete[% END %]
265
                    [% IF ( serial.status6 ) %]Delete[% END %]
262
                    [% IF ( serial.status7 ) %]Claimed[% END %]
266
                    [% 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 309-314 $(document).ready(function() { Link Here
309
                  [% ELSE %]
329
                  [% ELSE %]
310
                    <option value="4">Missing</option>
330
                    <option value="4">Missing</option>
311
                  [% END %]
331
                  [% END %]
332
                  [% IF ( newserialloo.status41 ) %]
333
                    <option value="41" selected="selected">Missing (never received)</option>
334
                  [% ELSE %]
335
                    <option value="41">Missing (never received)</option>
336
                  [% END %]
337
                  [% IF ( newserialloo.status42 ) %]
338
                    <option value="42" selected="selected">Missing (sold out)</option>
339
                  [% ELSE %]
340
                    <option value="42">Missing (sold out)</option>
341
                  [% END %]
342
                  [% IF ( newserialloo.status43 ) %]
343
                    <option value="43" selected="selected">Missing (damaged)</option>
344
                  [% ELSE %]
345
                    <option value="43">Missing (damaged)</option>
346
                  [% END %]
347
                  [% IF ( newserialloo.status44 ) %]
348
                    <option value="44" selected="selected">Missing (lost)</option>
349
                  [% ELSE %]
350
                    <option value="44">Missing (lost)</option>
351
                  [% END %]
312
                  [% IF ( newserialloo.status7 ) %]
352
                  [% IF ( newserialloo.status7 ) %]
313
                    <option value="7" selected="selected">Claimed</option>
353
                    <option value="7" selected="selected">Claimed</option>
314
                  [% ELSE %]
354
                  [% 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 1213-1232 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
1213
                </td>
1213
                </td>
1214
                <td>    [% latestserial.planneddate %]
1214
                <td>    [% latestserial.planneddate %]
1215
                </td>
1215
                </td>
1216
                <td>    [% IF ( latestserial.status1 ) %]Awaited
1216
                <td>
1217
                    [% ELSE %]
1217
                    [% IF ( latestserial.status1 ) %]Expected[% END %]
1218
                    [% IF ( latestserial.status2 ) %]Arrived
1218
                    [% IF ( latestserial.status2 ) %]Arrived[% END %]
1219
                    [% ELSE %]
1219
                    [% IF ( latestserial.status3 ) %]Late[% END %]
1220
                    [% IF ( latestserial.status3 ) %]Late
1220
                    [% IF ( latestserial.status4 ) %]Missing[% END %]
1221
                    [% ELSE %]
1221
                    [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
1222
                    [% IF ( latestserial.status4 ) %]Missing
1222
                    [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
1223
                    [% ELSE %]
1223
                    [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
1224
                    [% IF ( latestserial.status5 ) %]Not issued
1224
                    [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
1225
                    [% END %]
1225
                    [% IF ( latestserial.status5 ) %]Not issued[% END %]
1226
                    [% END %]
1226
                    [% IF ( latestserial.status6 ) %]Delete[% END %]
1227
                    [% END %]
1227
                    [% IF ( latestserial.status7 ) %]Claimed[% END %]
1228
                    [% END %]
1228
                    [% IF ( latestserial.status8 ) %]Stopped[% END %]
1229
                    [% END %]
1230
                </td>
1229
                </td>
1231
                <td>    [% latestserial.notes %]
1230
                <td>    [% latestserial.notes %]
1232
                </td>
1231
                </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