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 848-854
sub GetLatestSerials {
Link Here
|
848 |
my $strsth = "SELECT serialid,serialseq, status, planneddate, publisheddate, notes |
850 |
my $strsth = "SELECT serialid,serialseq, status, planneddate, publisheddate, notes |
849 |
FROM serial |
851 |
FROM serial |
850 |
WHERE subscriptionid = ? |
852 |
WHERE subscriptionid = ? |
851 |
AND (status =2 or status=4) |
853 |
AND status IN (2, 4, 41, 42, 43, 44) |
852 |
ORDER BY publisheddate DESC LIMIT 0,$limit |
854 |
ORDER BY publisheddate DESC LIMIT 0,$limit |
853 |
"; |
855 |
"; |
854 |
my $sth = $dbh->prepare($strsth); |
856 |
my $sth = $dbh->prepare($strsth); |
Lines 1147-1153
sub ModSerialStatus {
Link Here
|
1147 |
$missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g; |
1149 |
$missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g; |
1148 |
} |
1150 |
} |
1149 |
$missinglist .= "; $serialseq" |
1151 |
$missinglist .= "; $serialseq" |
1150 |
if $status==4 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; |
1152 |
if ( $status==4 or $status == 41 or $status == 42 or $status == 43 or $status == 44 ) |
|
|
1153 |
&& $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; |
1151 |
$missinglist .= "; not issued $serialseq" |
1154 |
$missinglist .= "; not issued $serialseq" |
1152 |
if $status==5 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; |
1155 |
if $status==5 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; |
1153 |
|
1156 |
|
Lines 1872-1878
sub GetLateOrMissingIssues {
Link Here
|
1872 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1875 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1873 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1876 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1874 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1877 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1875 |
AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) |
1878 |
AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) |
1876 |
AND subscription.aqbooksellerid=$supplierid |
1879 |
AND subscription.aqbooksellerid=$supplierid |
1877 |
$byserial |
1880 |
$byserial |
1878 |
ORDER BY $order" |
1881 |
ORDER BY $order" |
Lines 1889-1895
sub GetLateOrMissingIssues {
Link Here
|
1889 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1892 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1890 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1893 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1891 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1894 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1892 |
AND (serial.STATUS = 4 OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) |
1895 |
AND (serial.STATUS IN (4, 41, 42, 43, 44) OR ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3 OR serial.STATUS = 7)) |
1893 |
$byserial |
1896 |
$byserial |
1894 |
ORDER BY $order" |
1897 |
ORDER BY $order" |
1895 |
); |
1898 |
); |