|
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 |
); |